diff options
Diffstat (limited to 'jrt_test/src/tests/echo')
| -rw-r--r-- | jrt_test/src/tests/echo/dotest.sh | 13 | ||||
| -rwxr-xr-x | jrt_test/src/tests/echo/echo_test.sh | 7 | ||||
| -rw-r--r-- | jrt_test/src/tests/echo/progdefs.sh | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/jrt_test/src/tests/echo/dotest.sh b/jrt_test/src/tests/echo/dotest.sh index a4b9cc4d313..91b26c7f425 100644 --- a/jrt_test/src/tests/echo/dotest.sh +++ b/jrt_test/src/tests/echo/dotest.sh @@ -1,16 +1,17 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e + +fail=0 . ../../binref/env.sh export PORT_2 -sh $BINREF/progctl.sh progdefs.sh start javaserver 1 -$BINREF/runjava PollRPCServer tcp/localhost:$PORT_2 -$VALGRIND ./jrt_test_echo-client_app tcp/localhost:$PORT_2 > out.txt -sh $BINREF/progctl.sh progdefs.sh stop javaserver 1 +$BINREF/progctl.sh progdefs.sh start javaserver 1 +$BINREF/runjava PollRPCServer tcp/localhost:$PORT_2 || fail=1 +$VALGRIND ./jrt_test_echo-client_app tcp/localhost:$PORT_2 > out.txt || fail=1 +$BINREF/progctl.sh progdefs.sh stop javaserver 1 if diff -u out.txt ref.txt; then - exit 0 + exit $fail else exit 1 fi diff --git a/jrt_test/src/tests/echo/echo_test.sh b/jrt_test/src/tests/echo/echo_test.sh index 8b68357e606..997d8d42996 100755 --- a/jrt_test/src/tests/echo/echo_test.sh +++ b/jrt_test/src/tests/echo/echo_test.sh @@ -1,5 +1,6 @@ #!/bin/bash -set -e +fail=0 . ../../binref/env.sh -bash -e dotest.sh || (bash -e $BINREF/progctl.sh progdefs.sh stop all; false) -bash -e $BINREF/progctl.sh progdefs.sh stop all +bash ./dotest.sh || fail=1 +$BINREF/progctl.sh progdefs.sh stop all +exit $fail diff --git a/jrt_test/src/tests/echo/progdefs.sh b/jrt_test/src/tests/echo/progdefs.sh index d405f525e33..4a3053ad64e 100644 --- a/jrt_test/src/tests/echo/progdefs.sh +++ b/jrt_test/src/tests/echo/progdefs.sh @@ -1,4 +1,2 @@ -#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e prog javaserver 1 "tcp/$PORT_2" "$BINREF/runjava SimpleServer" |