Revert "Avoid using vespamalloc for small utility programs as it has a too hi… [run-systemtest]"

10 files changed, 14 insertions, 8 deletions

diff --git a/config/src/apps/vespa-get-config/.gitignore b/config/src/apps/vespa-get-config/.gitignore
index a6c00fa4508..141e1e034fd 100644
--- a/config/src/apps/vespa-get-config/.gitignore
+++ b/config/src/apps/vespa-get-config/.gitignore
@@ -1,4 +1,4 @@
 /.depend
 /Makefile
 /getvespaconfig
-vespa-get-config
+vespa-get-config-bin
diff --git a/config/src/apps/vespa-get-config/CMakeLists.txt b/config/src/apps/vespa-get-config/CMakeLists.txt
index b6dea3e1508..eb6b49ff824 100644
--- a/config/src/apps/vespa-get-config/CMakeLists.txt
+++ b/config/src/apps/vespa-get-config/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(config_getvespaconfig_app
     SOURCES
     getconfig.cpp
-    OUTPUT_NAME vespa-get-config
+    OUTPUT_NAME vespa-get-config-bin
     INSTALL bin
     DEPENDS
     config_cloudconfig
diff --git a/configd/src/apps/cmd/.gitignore b/configd/src/apps/cmd/.gitignore
index 5c0a1e06041..c79a9a7a643 100644
--- a/configd/src/apps/cmd/.gitignore
+++ b/configd/src/apps/cmd/.gitignore
@@ -1 +1 @@
-/vespa-sentinel-cmd
+/vespa-sentinel-cmd-bin
diff --git a/configd/src/apps/cmd/CMakeLists.txt b/configd/src/apps/cmd/CMakeLists.txt
index 7b670ad9abe..f02865cf9a9 100644
--- a/configd/src/apps/cmd/CMakeLists.txt
+++ b/configd/src/apps/cmd/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(configd_vespa-sentinel-cmd_app
     SOURCES
     main.cpp
-    OUTPUT_NAME vespa-sentinel-cmd
+    OUTPUT_NAME vespa-sentinel-cmd-bin
     INSTALL bin
     DEPENDS
     fnet
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;
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt
index 029faa15f2f..d709a4b90d2 100644
--- a/vespabase/CMakeLists.txt
+++ b/vespabase/CMakeLists.txt
@@ -1,10 +1,14 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_install_script(src/start-cbinaries.sh vespa-get-config bin)
 vespa_install_script(src/start-cbinaries.sh vespa-verify-ranksetup bin)
 vespa_install_script(src/start-cbinaries.sh vespa-config-status bin)
 vespa_install_script(src/start-cbinaries.sh vespa-configproxy-cmd 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)
 vespa_install_script(src/start-cbinaries.sh vespa-distributord sbin)
 vespa_install_script(src/start-cbinaries.sh vespa-proton sbin)
diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore b/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore
index 7c1657e5caa..573df74b762 100644
--- a/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore
+++ b/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore
@@ -1,3 +1,4 @@
 .depend
 Makefile
 vespa-route
+vespa-route-bin
diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt b/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt
index ddf500560c7..3b342387d01 100644
--- a/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt
+++ b/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt
@@ -5,7 +5,7 @@ vespa_add_executable(vespaclient_vesparoute_app
     main.cpp
     mynetwork.cpp
     params.cpp
-    OUTPUT_NAME vespa-route
+    OUTPUT_NAME vespa-route-bin
     INSTALL bin
     DEPENDS
 )