diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-31 10:21:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 10:21:21 +0100 |
| commit | 01f5a24bd0a3b74c33ca935f82ff6d6a4c3ed55d (patch) | |
| tree | dc40b8e9d18e0245ceed6e21f66d986027986f24 /fnet | |
| parent | 139420fda334dbcfe80f49d9badb5f26ca160d92 (diff) | |
Revert "Avoid using vespamalloc for small utility programs as it has a too hi… [run-systemtest]"
Diffstat (limited to 'fnet')
| -rw-r--r-- | fnet/src/examples/frt/rpc/.gitignore | 1 | ||||
| -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, 3 deletions
diff --git a/fnet/src/examples/frt/rpc/.gitignore b/fnet/src/examples/frt/rpc/.gitignore index a4a999dc119..76876fa7cda 100644 --- a/fnet/src/examples/frt/rpc/.gitignore +++ b/fnet/src/examples/frt/rpc/.gitignore @@ -12,4 +12,5 @@ fnet_rpc_callback_server_app fnet_rpc_client_app fnet_rpc_server_app vespa-rpc-info +vespa-rpc-invoke-bin vespa-rpc-proxy diff --git a/fnet/src/examples/frt/rpc/CMakeLists.txt b/fnet/src/examples/frt/rpc/CMakeLists.txt index de4f9e89864..7cad990b090 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 2b05ec57081..74271a7ef5c 100644 --- a/fnet/src/tests/examples/examples_test.cpp +++ b/fnet/src/tests/examples/examples_test.cpp @@ -76,7 +76,7 @@ TEST("usage") { EXPECT_FALSE(runProc(proc, done)); } { - ChildProcess proc("exec ../../examples/frt/rpc/vespa-rpc-invoke"); + ChildProcess proc("exec ../../examples/frt/rpc/vespa-rpc-invoke-bin"); EXPECT_FALSE(runProc(proc, done)); } { @@ -199,7 +199,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; |