Merge pull request #2782 from yahoo/toregge/rename-fbench-programs-further

Rename vespa-geturl to vespa-fbench-geturl.

6 files changed, 11 insertions, 11 deletions

diff --git a/fbench/CMakeLists.txt b/fbench/CMakeLists.txt
index a2847c8b8ad..2fbffd6eb96 100644
--- a/fbench/CMakeLists.txt
+++ b/fbench/CMakeLists.txt
@@ -12,4 +12,4 @@ vespa_define_module(
     src/test
 )
 
-vespa_install_script(util/resultfilter.pl vespa-resultfilter.pl bin)
+vespa_install_script(util/resultfilter.pl vespa-fbench-result-filter.pl bin)
diff --git a/fbench/README b/fbench/README
index 11ae8b24bec..6627786edfb 100644
--- a/fbench/README
+++ b/fbench/README
@@ -15,10 +15,10 @@ fbench install directory should contain the following set of files:
   README
   bin/vespa-fbench
   bin/vespa-fbench-filter-file
-  bin/vespa-geturl
+  bin/vespa-fbench-geturl
   bin/plot.pl
   bin/pretest.sh
-  bin/vespa-resultfilter.pl
+  bin/vespa-fbench-result-filter.pl
   bin/runtests.sh
   bin/separate.pl
   bin/vespa-fbench-split-file
@@ -263,7 +263,7 @@ results. This section will explain what each of these numbers mean.
 
 For more complete benchmarking you will want to combine the results
 from several test runs and present them together in a graph or maybe a
-spreadsheet. The perl script vespa-resultfilter.pl may be used to convert
+spreadsheet. The perl script vespa-fbench-result-filter.pl may be used to convert
 the output from vespa-fbench into a single line of numbers. Lines of numbers
 produced from several test runs may then be concatenated into the same
 text file and used to plot a graph with gnuplot or imported into an
@@ -288,7 +288,7 @@ on.  (vespa-fbench is run as 'bin/vespa-fbench' etc.).
 | <deltaClients> increments. For each client count, the cycle time will
 | vary in the same way according to <minCycle>, <maxCycle> and <deltaCycle>.
 | vespa-fbench is run with each combination of client count and cycle time, and
-| the result output is filtered with the 'vespa-resultfilter.pl' script.
+| the result output is filtered with the 'vespa-fbench-result-filter.pl' script.
 | If you want to save the results you should redirect stdout to a file.
 | 
 |  -o : change the order in which the tests are performed so that client
diff --git a/fbench/src/geturl/.gitignore b/fbench/src/geturl/.gitignore
index ad21b60cbde..7548d732f04 100644
--- a/fbench/src/geturl/.gitignore
+++ b/fbench/src/geturl/.gitignore
@@ -1,5 +1,5 @@
 .depend
 Makefile
-vespa-geturl
+vespa-fbench-geturl
 geturl.ilk
 geturl.pdb
diff --git a/fbench/src/geturl/CMakeLists.txt b/fbench/src/geturl/CMakeLists.txt
index 85ae66bc0e3..68cb74fdf3f 100644
--- a/fbench/src/geturl/CMakeLists.txt
+++ b/fbench/src/geturl/CMakeLists.txt
@@ -2,7 +2,7 @@
 vespa_add_executable(fbench_geturl_app
     SOURCES
     geturl.cpp
-    OUTPUT_NAME vespa-geturl
+    OUTPUT_NAME vespa-fbench-geturl
     INSTALL bin
     DEPENDS
     fbench_util
diff --git a/fbench/src/geturl/geturl.cpp b/fbench/src/geturl/geturl.cpp
index d6bcdc6dd3b..f1a4c006192 100644
--- a/fbench/src/geturl/geturl.cpp
+++ b/fbench/src/geturl/geturl.cpp
@@ -6,7 +6,7 @@ int
 main(int argc, char** argv)
 {
     if (argc != 4) {
-        printf("usage: vespa-geturl <host> <port> <url>\n");
+        printf("usage: vespa-fbench-geturl <host> <port> <url>\n");
         return -1;
     }
 
diff --git a/fbench/util/runtests.sh b/fbench/util/runtests.sh
index cc921d96742..b4b2f222e7a 100755
--- a/fbench/util/runtests.sh
+++ b/fbench/util/runtests.sh
@@ -23,7 +23,7 @@ if [ $# -lt 8 ] || [ "$opt_error" = "true" ]; then
     echo "<deltaClients> increments. For each client count, the cycle time will"
     echo "vary in the same way according to <minCycle>, <maxCycle> and <deltaCycle>."
     echo "vespa-fbench is run with each combination of client count and cycle time, and"
-    echo "the result output is filtered with the 'vespa-resultfilter.pl' script."
+    echo "the result output is filtered with the 'vespa-fbench-result-filter.pl' script."
     echo "If you want to save the results you should redirect stdout to a file."
     echo ""
     echo " -o : change the order in which the tests are performed so that client"
@@ -71,7 +71,7 @@ if [ "$opt_o" = "true" ]; then
 	clients=$minClients
 	while [ ! $clients -gt $maxClients ]; do
 	    test -f pretest.sh && ./pretest.sh > /dev/null 2>&1
-	    vespa-fbench -n $clients -c $cycle $@ | vespa-resultfilter.pl
+	    vespa-fbench -n $clients -c $cycle $@ | vespa-fbench-result-filter.pl
 	    clients=$(($clients + $deltaClients))
 	done
 	[ "$opt_l" = "true" ] && echo ""
@@ -83,7 +83,7 @@ else
 	cycle=$minCycle
 	while [ ! $cycle -gt $maxCycle ]; do
 	    test -f pretest.sh && ./pretest.sh > /dev/null 2>&1
-	    vespa-fbench -n $clients -c $cycle $@ | vespa-resultfilter.pl
+	    vespa-fbench -n $clients -c $cycle $@ | vespa-fbench-result-filter.pl
 	    cycle=$(($cycle + $deltaCycle))
 	done
 	[ "$opt_l" = "true" ] && echo ""