diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2019-12-10 10:32:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 10:32:41 +0100 |
| commit | 42f036e7669efd719b436f35df3d1f5e37ba9379 (patch) | |
| tree | 4e231663a13db47e0a79bdad661ddd49a28281dd /fnet | |
| parent | b4d12c157ce60cea408d83ae499d4c364a90aac3 (diff) | |
Revert "Revert "Revert "Use shell script wrapper for vespa-rpc-invoke"""
Diffstat (limited to 'fnet')
| -rw-r--r-- | fnet/src/examples/frt/rpc/.gitignore | 2 | ||||
| -rw-r--r-- | fnet/src/examples/frt/rpc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | fnet/src/tests/examples/examples_test.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fnet/src/examples/frt/rpc/.gitignore b/fnet/src/examples/frt/rpc/.gitignore index 76876fa7cda..907b6c8a249 100644 --- a/fnet/src/examples/frt/rpc/.gitignore +++ b/fnet/src/examples/frt/rpc/.gitignore @@ -12,5 +12,5 @@ fnet_rpc_callback_server_app fnet_rpc_client_app fnet_rpc_server_app vespa-rpc-info -vespa-rpc-invoke-bin +vespa-rpc-invoke vespa-rpc-proxy 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<bool>()) { 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; |