From 8ee857aab67c1a7c7a5a7856966b76eda0d16fb0 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@broadpark.no>
Date: Tue, 10 Dec 2019 10:41:38 +0100
Subject: Revert "Revert "Revert "Revert "Use shell script wrapper for
 vespa-rpc-invoke""""

---
 fnet/src/examples/frt/rpc/.gitignore      | 2 +-
 fnet/src/examples/frt/rpc/CMakeLists.txt  | 2 +-
 fnet/src/tests/examples/examples_test.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'fnet/src')

diff --git a/fnet/src/examples/frt/rpc/.gitignore b/fnet/src/examples/frt/rpc/.gitignore
index 907b6c8a249..76876fa7cda 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
+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 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;
-- 
cgit v1.2.3