diff options
-rwxr-xr-x | messagebus_test/src/tests/error/ctl.sh | 8 | ||||
-rw-r--r-- | messagebus_test/src/tests/error/error.cpp | 16 | ||||
-rw-r--r-- | messagebus_test/src/tests/error/progdefs.sh | 2 | ||||
-rw-r--r-- | messagebus_test/src/tests/errorcodes/CMakeLists.txt | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | messagebus_test/src/tests/errorcodes/errorcodes_test.sh | 9 | ||||
-rw-r--r-- | messagebus_test/src/tests/speed/CMakeLists.txt | 6 | ||||
-rwxr-xr-x | messagebus_test/src/tests/speed/ctl.sh | 8 | ||||
-rw-r--r-- | messagebus_test/src/tests/speed/progdefs.sh | 2 | ||||
-rw-r--r-- | messagebus_test/src/tests/speed/speed.cpp | 17 | ||||
-rwxr-xr-x[-rw-r--r--] | messagebus_test/src/tests/speed/speed_test.sh | 2 | ||||
-rw-r--r-- | messagebus_test/src/tests/trace/CMakeLists.txt | 4 | ||||
-rwxr-xr-x | messagebus_test/src/tests/trace/ctl.sh | 8 | ||||
-rw-r--r-- | messagebus_test/src/tests/trace/progdefs.sh | 14 | ||||
-rw-r--r-- | messagebus_test/src/tests/trace/trace.cpp | 7 | ||||
-rwxr-xr-x[-rw-r--r--] | messagebus_test/src/tests/trace/trace_test.sh | 2 |
15 files changed, 76 insertions, 33 deletions
diff --git a/messagebus_test/src/tests/error/ctl.sh b/messagebus_test/src/tests/error/ctl.sh index 864be4290ed..d018444c499 100755 --- a/messagebus_test/src/tests/error/ctl.sh +++ b/messagebus_test/src/tests/error/ctl.sh @@ -1,4 +1,10 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -exec ../../binref/progctl.sh progdefs.sh "$@" +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + +. ../../binref/env.sh + +exec $BINREF/progctl.sh $SOURCE_DIRECTORY/progdefs.sh "$@" diff --git a/messagebus_test/src/tests/error/error.cpp b/messagebus_test/src/tests/error/error.cpp index 9b01e5d61d0..63991b34a95 100644 --- a/messagebus_test/src/tests/error/error.cpp +++ b/messagebus_test/src/tests/error/error.cpp @@ -3,6 +3,7 @@ #include <vespa/log/log.h> LOG_SETUP("error_test"); #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/messagebus/testlib/slobrok.h> #include <vespa/vespalib/util/stringfmt.h> @@ -16,6 +17,9 @@ Test::Main() { TEST_INIT("error_test"); Slobrok slobrok; + const std::string routing_template = TEST_PATH("routing-template.cfg"); + const std::string ctl_script = TEST_PATH("ctl.sh"); + { // Make slobrok config EXPECT_TRUE(system("echo slobrok[1] > slobrok.cfg") == 0); EXPECT_TRUE(system(make_string("echo 'slobrok[0].connectionspec tcp/localhost:%d' " @@ -23,23 +27,23 @@ Test::Main() } { // CPP SERVER { // Make routing config - EXPECT_TRUE(system("cat routing-template.cfg | sed 's#session#cpp/session#' > routing.cfg") == 0); + EXPECT_TRUE(system(("cat " + routing_template + " | sed 's#session#cpp/session#' > routing.cfg").c_str()) == 0); } fprintf(stderr, "STARTING CPP-SERVER\n"); - EXPECT_TRUE(system("sh ctl.sh start server cpp") == 0); + EXPECT_TRUE(system((ctl_script + " start server cpp").c_str()) == 0); EXPECT_TRUE(system("./messagebus_test_cpp-client-error_app") == 0); EXPECT_TRUE(system("../../binref/runjava JavaClient") == 0); - EXPECT_TRUE(system("sh ctl.sh stop server cpp") == 0); + EXPECT_TRUE(system((ctl_script + " stop server cpp").c_str()) == 0); } { // JAVA SERVER { // Make routing config - EXPECT_TRUE(system("cat routing-template.cfg | sed 's#session#java/session#' > routing.cfg") == 0); + EXPECT_TRUE(system("cat " + routing_tesmplate + " | sed 's#session#java/session#' > routing.cfg").c_str()) == 0); } fprintf(stderr, "STARTING JAVA-SERVER\n"); - EXPECT_TRUE(system("sh ctl.sh start server java") == 0); + EXPECT_TRUE(system((ctl_script + " start server java").c_str()) == 0); EXPECT_TRUE(system("./messagebus_test_cpp-client-error_app") == 0); EXPECT_TRUE(system("../../binref/runjava JavaClient") == 0); - EXPECT_TRUE(system("sh ctl.sh stop server java") == 0); + EXPECT_TRUE(system((ctl_script + " stop server java").c_str()) == 0); } TEST_DONE(); } diff --git a/messagebus_test/src/tests/error/progdefs.sh b/messagebus_test/src/tests/error/progdefs.sh index 2f6f37a9425..47d02d95b93 100644 --- a/messagebus_test/src/tests/error/progdefs.sh +++ b/messagebus_test/src/tests/error/progdefs.sh @@ -1,3 +1,3 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. prog server cpp "" "./messagebus_test_cpp-server-error_app" -prog server java "" "../../binref/runjava JavaServer" +prog server java "" "$BINREF/runjava JavaServer" diff --git a/messagebus_test/src/tests/errorcodes/CMakeLists.txt b/messagebus_test/src/tests/errorcodes/CMakeLists.txt index 3e12ae340d3..dc099903c57 100644 --- a/messagebus_test/src/tests/errorcodes/CMakeLists.txt +++ b/messagebus_test/src/tests/errorcodes/CMakeLists.txt @@ -3,5 +3,7 @@ vespa_add_executable(messagebus_test_dumpcodes_app TEST SOURCES dumpcodes.cpp DEPENDS + messagebus ) -vespa_add_test(NAME messagebus_test_dumpcodes_app NO_VALGRIND COMMAND sh errorcodes_test.sh) +vespa_add_test(NAME messagebus_test_dumpcodes_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIRECTORY}/errorcodes_test.sh + DEPENDS messagebus_test_dumpcodes_app) diff --git a/messagebus_test/src/tests/errorcodes/errorcodes_test.sh b/messagebus_test/src/tests/errorcodes/errorcodes_test.sh index 7c30378cd1a..a296f21ef4a 100644..100755 --- a/messagebus_test/src/tests/errorcodes/errorcodes_test.sh +++ b/messagebus_test/src/tests/errorcodes/errorcodes_test.sh @@ -1,10 +1,15 @@ #!/bin/bash set -e + +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + . ../../binref/env.sh $BINREF/compilejava DumpCodes.java ./messagebus_test_dumpcodes_app > cpp-dump.txt $BINREF/runjava DumpCodes > java-dump.txt -diff -u ref-dump.txt cpp-dump.txt -diff -u ref-dump.txt java-dump.txt +diff -u $SOURCE_DIRECTORY/ref-dump.txt cpp-dump.txt +diff -u $SOURCE_DIRECTORY/ref-dump.txt java-dump.txt diff --git a/messagebus_test/src/tests/speed/CMakeLists.txt b/messagebus_test/src/tests/speed/CMakeLists.txt index 8e1018ec07c..84092021584 100644 --- a/messagebus_test/src/tests/speed/CMakeLists.txt +++ b/messagebus_test/src/tests/speed/CMakeLists.txt @@ -3,15 +3,19 @@ vespa_add_executable(messagebus_test_speed_test_app SOURCES speed.cpp DEPENDS + messagebus ) -vespa_add_test(NAME messagebus_test_speed_test_app COMMAND messagebus_test_speed_test_app BENCHMARK) vespa_add_executable(messagebus_test_cpp-server-speed_app SOURCES cpp-server.cpp DEPENDS + messagebus ) vespa_add_executable(messagebus_test_cpp-client-speed_app SOURCES cpp-client.cpp DEPENDS + messagebus ) +vespa_add_test(NAME messagebus_test_speed_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/speed_test.sh BENCHMARK + DEPENDS messagebus_test_speed_test_app messagebus_test_cpp-server-speed_app messagebus_test_cpp-client-speed_app ) diff --git a/messagebus_test/src/tests/speed/ctl.sh b/messagebus_test/src/tests/speed/ctl.sh index 864be4290ed..ca4fc7701e6 100755 --- a/messagebus_test/src/tests/speed/ctl.sh +++ b/messagebus_test/src/tests/speed/ctl.sh @@ -1,4 +1,10 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -exec ../../binref/progctl.sh progdefs.sh "$@" +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + +. ../../binref/env.sh + +exec $SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh "$@" diff --git a/messagebus_test/src/tests/speed/progdefs.sh b/messagebus_test/src/tests/speed/progdefs.sh index 4e0390142cf..0b2bd600db0 100644 --- a/messagebus_test/src/tests/speed/progdefs.sh +++ b/messagebus_test/src/tests/speed/progdefs.sh @@ -1,3 +1,3 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. prog server cpp "" "./messagebus_test_cpp-server-speed_app" -prog server java "" "../../binref/runjava JavaServer" +prog server java "" "$BINREF/runjava JavaServer" diff --git a/messagebus_test/src/tests/speed/speed.cpp b/messagebus_test/src/tests/speed/speed.cpp index 31ea419ce5c..3a5f56c6144 100644 --- a/messagebus_test/src/tests/speed/speed.cpp +++ b/messagebus_test/src/tests/speed/speed.cpp @@ -3,6 +3,7 @@ #include <vespa/log/log.h> LOG_SETUP("speed_test"); #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/messagebus/testlib/slobrok.h> #include <vespa/vespalib/util/stringfmt.h> @@ -16,6 +17,10 @@ Test::Main() { TEST_INIT("speed_test"); Slobrok slobrok; + + const std::string routing_template = TEST_PATH("routing-template.cfg"); + const std::string ctl_script = TEST_PATH("ctl.sh"); + { // Make slobrok config EXPECT_EQUAL(system("echo slobrok[1] > slobrok.cfg"), 0); EXPECT_EQUAL(system(make_string("echo 'slobrok[0].connectionspec tcp/localhost:%d' " @@ -23,29 +28,29 @@ Test::Main() } { // CPP SERVER { // Make routing config - EXPECT_EQUAL(system("cat routing-template.cfg | sed 's#session#cpp/session#' > routing.cfg"), 0); + EXPECT_EQUAL(system(("cat " + routing_template + " | sed 's#session#cpp/session#' > routing.cfg").c_str()), 0); } fprintf(stderr, "STARTING CPP-SERVER\n"); - EXPECT_EQUAL(system("sh ctl.sh start server cpp"), 0); + EXPECT_EQUAL(system((ctl_script + " start server cpp").c_str()), 0); fprintf(stderr, "STARTING CPP-CLIENT\n"); EXPECT_EQUAL(system("./messagebus_test_cpp-client-speed_app"), 0); fprintf(stderr, "STARTING JAVA-CLIENT\n"); EXPECT_EQUAL(system("../../binref/runjava JavaClient"), 0); fprintf(stderr, "STOPPING\n"); - EXPECT_EQUAL(system("sh ctl.sh stop server cpp"), 0); + EXPECT_EQUAL(system((ctl_script + " stop server cpp"), 0); } { // JAVA SERVER { // Make routing config - EXPECT_EQUAL(system("cat routing-template.cfg | sed 's#session#java/session#' > routing.cfg"), 0); + EXPECT_EQUAL(system(("cat " + routing_template + " | sed 's#session#java/session#' > routing.cfg").c_str()), 0); } fprintf(stderr, "STARTING JAVA-SERVER\n"); - EXPECT_EQUAL(system("sh ctl.sh start server java"), 0); + EXPECT_EQUAL(system((ctl_script + " start server java").c_str()), 0); fprintf(stderr, "STARTING CPP-CLIENT\n"); EXPECT_EQUAL(system("./messagebus_test_cpp-client-speed_app"), 0); fprintf(stderr, "STARTING JAVA-CLIENT\n"); EXPECT_EQUAL(system("../../binref/runjava JavaClient"), 0); fprintf(stderr, "STOPPING\n"); - EXPECT_EQUAL(system("sh ctl.sh stop server java"), 0); + EXPECT_EQUAL(system((ctl_script + " stop server java").c_str()), 0); } TEST_DONE(); } diff --git a/messagebus_test/src/tests/speed/speed_test.sh b/messagebus_test/src/tests/speed/speed_test.sh index 77eb7e63e0c..4aefc712fb9 100644..100755 --- a/messagebus_test/src/tests/speed/speed_test.sh +++ b/messagebus_test/src/tests/speed/speed_test.sh @@ -6,4 +6,4 @@ set -e $BINREF/compilejava JavaServer.java $BINREF/compilejava JavaClient.java -(ulimit -c; ulimit -H -c; ulimit -c unlimited; ./messagebus_test_speed_test_app) +(ulimit -c; ulimit -H -c; ulimit -c unlimited; $VALGRIND ./messagebus_test_speed_test_app) diff --git a/messagebus_test/src/tests/trace/CMakeLists.txt b/messagebus_test/src/tests/trace/CMakeLists.txt index af539fa2818..f14fbd705f4 100644 --- a/messagebus_test/src/tests/trace/CMakeLists.txt +++ b/messagebus_test/src/tests/trace/CMakeLists.txt @@ -3,11 +3,13 @@ vespa_add_executable(messagebus_test_trace_test_app TEST SOURCES trace.cpp DEPENDS + messagebus ) vespa_add_executable(messagebus_test_cpp-server-trace_app SOURCES cpp-server.cpp DEPENDS + messagebus ) -vespa_add_test(NAME messagebus_test_trace_test_app NO_VALGRIND COMMAND sh trace_test.sh +vespa_add_test(NAME messagebus_test_trace_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/trace_test.sh DEPENDS messagebus_test_trace_test_app messagebus_test_cpp-server-trace_app) diff --git a/messagebus_test/src/tests/trace/ctl.sh b/messagebus_test/src/tests/trace/ctl.sh index 864be4290ed..ca4fc7701e6 100755 --- a/messagebus_test/src/tests/trace/ctl.sh +++ b/messagebus_test/src/tests/trace/ctl.sh @@ -1,4 +1,10 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -exec ../../binref/progctl.sh progdefs.sh "$@" +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + +. ../../binref/env.sh + +exec $SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh "$@" diff --git a/messagebus_test/src/tests/trace/progdefs.sh b/messagebus_test/src/tests/trace/progdefs.sh index fd35b6503e2..4071da4beb5 100644 --- a/messagebus_test/src/tests/trace/progdefs.sh +++ b/messagebus_test/src/tests/trace/progdefs.sh @@ -6,10 +6,10 @@ prog server cpp4 "" "./messagebus_test_cpp-server-trace_app server/cpp/3/A" prog server cpp5 "" "./messagebus_test_cpp-server-trace_app server/cpp/3/B" prog server cpp6 "" "./messagebus_test_cpp-server-trace_app server/cpp/3/C" prog server cpp7 "" "./messagebus_test_cpp-server-trace_app server/cpp/3/D" -prog server java1 "" "../../binref/runjava JavaServer server/java/1/A" -prog server java2 "" "../../binref/runjava JavaServer server/java/2/A" -prog server java3 "" "../../binref/runjava JavaServer server/java/2/B" -prog server java4 "" "../../binref/runjava JavaServer server/java/3/A" -prog server java5 "" "../../binref/runjava JavaServer server/java/3/B" -prog server java6 "" "../../binref/runjava JavaServer server/java/3/C" -prog server java7 "" "../../binref/runjava JavaServer server/java/3/D" +prog server java1 "" "$BINREF/runjava JavaServer server/java/1/A" +prog server java2 "" "$BINREF/runjava JavaServer server/java/2/A" +prog server java3 "" "$BINREF/runjava JavaServer server/java/2/B" +prog server java4 "" "$BINREF/runjava JavaServer server/java/3/A" +prog server java5 "" "$BINREF/runjava JavaServer server/java/3/B" +prog server java6 "" "$BINREF/runjava JavaServer server/java/3/C" +prog server java7 "" "$BINREF/runjava JavaServer server/java/3/D" diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp index 94550460c84..320110d10e2 100644 --- a/messagebus_test/src/tests/trace/trace.cpp +++ b/messagebus_test/src/tests/trace/trace.cpp @@ -3,6 +3,7 @@ #include <vespa/log/log.h> LOG_SETUP("trace_test"); #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/messagebus/testlib/slobrok.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/messagebus/emptyreply.h> @@ -44,12 +45,14 @@ Test::Main() { TEST_INIT("trace_test"); Slobrok slobrok; + const std::string ctl_script = TEST_PATH("ctl.sh"); + { // Make slobrok config EXPECT_TRUE(system("echo slobrok[1] > slobrok.cfg") == 0); EXPECT_TRUE(system(make_string("echo 'slobrok[0].connectionspec tcp/localhost:%d' " ">> slobrok.cfg", slobrok.port()).c_str()) == 0); } - EXPECT_TRUE(system("sh ctl.sh start all") == 0); + EXPECT_TRUE(system((ctl_script + " start all").c_str()) == 0); RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())), RPCNetworkParams().setSlobrokConfig("file:slobrok.cfg"), "file:routing.cfg"); @@ -108,6 +111,6 @@ Test::Main() EXPECT_TRUE(!reply->hasErrors()); EXPECT_EQUAL(reply->getTrace().getRoot().encode(), expect.encode()); - EXPECT_TRUE(system("sh ctl.sh stop all") == 0); + EXPECT_TRUE(system((ctl_script + " stop all").c_str()) == 0); TEST_DONE(); } diff --git a/messagebus_test/src/tests/trace/trace_test.sh b/messagebus_test/src/tests/trace/trace_test.sh index 63005385332..8f4a725840d 100644..100755 --- a/messagebus_test/src/tests/trace/trace_test.sh +++ b/messagebus_test/src/tests/trace/trace_test.sh @@ -5,4 +5,4 @@ set -e $BINREF/compilejava JavaServer.java -./messagebus_test_trace_test_app +$VALGRIND ./messagebus_test_trace_test_app |