From ee87cc8d429e3a0ead04ace9438267d75f17dec3 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 5 Dec 2019 21:21:47 +0100 Subject: Revert "Use shell script wrapper for vespa-rpc-invoke." --- fnet/src/examples/frt/rpc/CMakeLists.txt | 2 +- fnet/src/tests/examples/examples_test.cpp | 4 ++-- vespabase/CMakeLists.txt | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fnet/src/examples/frt/rpc/CMakeLists.txt b/fnet/src/examples/frt/rpc/CMakeLists.txt index 109284fa222..914525a2a57 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-bin + OUTPUT_NAME vespa-rpc-invoke INSTALL bin DEPENDS fnet diff --git a/fnet/src/tests/examples/examples_test.cpp b/fnet/src/tests/examples/examples_test.cpp index c704c58abc9..61a2408e39d 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-bin"); + SlaveProc proc("exec ../../examples/frt/rpc/vespa-rpc-invoke"); EXPECT_FALSE(runProc(proc, done)); } { @@ -197,7 +197,7 @@ TEST_MT_F("rpc invoke", 2, std::atomic()) { EXPECT_TRUE(runProc(proc, f1)); } else { TEST_BARRIER(); - EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/vespa-rpc-invoke-bin tcp/localhost:%d frt.rpc.echo " + EXPECT_TRUE(runProc(vespalib::make_string("exec ../../examples/frt/rpc/vespa-rpc-invoke 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 8faf58dd070..a7247d882f9 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -5,7 +5,6 @@ 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) -- cgit v1.2.3