diff options
Diffstat (limited to 'jrt_test/src/tests/rpc-error')
-rw-r--r-- | jrt_test/src/tests/rpc-error/CMakeLists.txt | 2 | ||||
-rw-r--r-- | jrt_test/src/tests/rpc-error/dotest.sh | 12 | ||||
-rwxr-xr-x | jrt_test/src/tests/rpc-error/rpc-error_test.sh | 10 |
3 files changed, 16 insertions, 8 deletions
diff --git a/jrt_test/src/tests/rpc-error/CMakeLists.txt b/jrt_test/src/tests/rpc-error/CMakeLists.txt index f4756f3dffa..fbe9720d55e 100644 --- a/jrt_test/src/tests/rpc-error/CMakeLists.txt +++ b/jrt_test/src/tests/rpc-error/CMakeLists.txt @@ -4,4 +4,4 @@ vespa_add_executable(jrt_test_test-errors_app TEST test-errors.cpp DEPENDS ) -vespa_add_test(NAME jrt_test_test-errors_app NO_VALGRIND COMMAND sh rpc-error_test.sh) +vespa_add_test(NAME jrt_test_test-errors_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rpc-error_test.sh) diff --git a/jrt_test/src/tests/rpc-error/dotest.sh b/jrt_test/src/tests/rpc-error/dotest.sh index df9cb4ac62a..5c68309f462 100644 --- a/jrt_test/src/tests/rpc-error/dotest.sh +++ b/jrt_test/src/tests/rpc-error/dotest.sh @@ -1,6 +1,10 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + fail=0 . ../../binref/env.sh @@ -12,7 +16,7 @@ CPP_PORT=$PORT_4 export JAVA_PORT export CPP_PORT -$BINREF/progctl.sh progdefs.sh start cppserver 1 || fail=1 +$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh start cppserver 1 || fail=1 $BINREF/runjava PollRPCServer tcp/localhost:$CPP_PORT || fail=1 echo "CPP CLIENT <-> CPP SERVER" @@ -21,8 +25,8 @@ echo "CPP CLIENT <-> CPP SERVER" echo "JAVA CLIENT <-> CPP SERVER" $BINREF/runjava TestErrors tcp/localhost:$CPP_PORT || fail=1 -$BINREF/progctl.sh progdefs.sh stop cppserver 1 -$BINREF/progctl.sh progdefs.sh start javaserver 1 +$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop cppserver 1 +$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh start javaserver 1 $BINREF/runjava PollRPCServer tcp/localhost:$JAVA_PORT || fail=1 echo "CPP CLIENT <-> JAVA SERVER" @@ -31,7 +35,7 @@ echo "CPP CLIENT <-> JAVA SERVER" echo "JAVA CLIENT <-> JAVA SERVER" $BINREF/runjava TestErrors tcp/localhost:$JAVA_PORT || fail=1 -$BINREF/progctl.sh progdefs.sh stop javaserver 1 +$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop javaserver 1 if [ $fail = "0" ]; then echo "OK" diff --git a/jrt_test/src/tests/rpc-error/rpc-error_test.sh b/jrt_test/src/tests/rpc-error/rpc-error_test.sh index bee324273b1..c30dae9dc82 100755 --- a/jrt_test/src/tests/rpc-error/rpc-error_test.sh +++ b/jrt_test/src/tests/rpc-error/rpc-error_test.sh @@ -1,5 +1,9 @@ #!/bin/bash +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + fail=0 . ../../binref/env.sh @@ -11,10 +15,10 @@ CPP_PORT=$PORT_4 export JAVA_PORT export CPP_PORT -$BINREF/compilejava TestErrors.java || fail=1 +$BINREF/compilejava -d . $SOURCE_DIRECTORY/TestErrors.java || fail=1 -bash ./dotest.sh || fail=1 +bash $SOURCE_DIRECTORY/dotest.sh || fail=1 -$BINREF/progctl.sh progdefs.sh stop all +$SOURCE_DIRECTORY/../../binref/progctl.sh $SOURCE_DIRECTORY/progdefs.sh stop all exit $fail |