diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-12-05 12:32:35 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-12-05 12:33:54 +0100 |
commit | 9eabd8463e4b27a05a4fab08107123271ad3f37f (patch) | |
tree | 75a5c1d27fa2ac04543b662ba001f920b6a826b8 | |
parent | a5aae6717193906f5753ff87868f9286365f08a7 (diff) |
Use shell script wrapper for vespa-rpc-invoke.
-rw-r--r-- | fnet/src/examples/frt/rpc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | fnet/src/tests/examples/examples_test.cpp | 4 | ||||
-rw-r--r-- | vespabase/CMakeLists.txt | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/fnet/src/examples/frt/rpc/CMakeLists.txt b/fnet/src/examples/frt/rpc/CMakeLists.txt index 914525a2a57..109284fa222 100644 --- a/fnet/src/examples/frt/rpc/CMakeLists.txt +++ b/fnet/src/examples/frt/rpc/CMakeLists.txt @@ -48,7 +48,7 @@ vespa_add_executable(fnet_rpc_callback_client_app vespa_add_executable(fnet_rpc_invoke_app SOURCES rpc_invoke.cpp - OUTPUT_NAME vespa-rpc-invoke + OUTPUT_NAME vespa-rpc-invoke-bin INSTALL bin DEPENDS fnet diff --git a/fnet/src/tests/examples/examples_test.cpp b/fnet/src/tests/examples/examples_test.cpp index 61a2408e39d..c704c58abc9 100644 --- a/fnet/src/tests/examples/examples_test.cpp +++ b/fnet/src/tests/examples/examples_test.cpp @@ -75,7 +75,7 @@ TEST("usage") { EXPECT_FALSE(runProc(proc, done)); } { - SlaveProc proc("exec ../../examples/frt/rpc/vespa-rpc-invoke"); + SlaveProc proc("exec ../../examples/frt/rpc/vespa-rpc-invoke-bin"); EXPECT_FALSE(runProc(proc, done)); } { @@ -197,7 +197,7 @@ TEST_MT_F("rpc invoke", 2, std::atomic<bool>()) { EXPECT_TRUE(runProc(proc, f1)); } else { TEST_BARRIER(); - EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/vespa-rpc-invoke tcp/localhost:%d frt.rpc.echo " + EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/vespa-rpc-invoke-bin tcp/localhost:%d frt.rpc.echo " "b:1 h:2 i:4 l:8 f:0.5 d:0.25 s:foo", PORT0).c_str())); f1 = true; diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index a7247d882f9..8faf58dd070 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -5,6 +5,7 @@ vespa_install_script(src/start-cbinaries.sh vespa-config-status bin) vespa_install_script(src/start-cbinaries.sh vespa-doclocator bin) vespa_install_script(src/start-cbinaries.sh vespa-model-inspect bin) vespa_install_script(src/start-cbinaries.sh vespa-proton-cmd bin) +vespa_install_script(src/start-cbinaries.sh vespa-rpc-invoke bin) vespa_install_script(src/start-cbinaries.sh vespa-sentinel-cmd bin) vespa_install_script(src/start-cbinaries.sh vespa-route bin) vespa_install_script(src/start-cbinaries.sh vespa-transactionlog-inspect bin) |