diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2016-06-28 15:42:27 +0200 |
|---|---|---|
| committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-06-28 15:42:27 +0200 |
| commit | 3011b26395cf1814e0258937ef343b7d03a0b1fc (patch) | |
| tree | b429fc1ecee36470f40fe3908653684b8cf01e01 /jrt_test/src/tests/rpc-error/rpc-error_test.sh | |
| parent | 47d97e4dd7c9fdde0d7170e4ae9a1bfe04349286 (diff) | |
Arnej/cleanup errexit usage 2 (#248)
* not a script that can use "set -e"
* run tests in correct order
* fix usage of progctl.sh
* should not use "set -e" in progdefs.sh
* simpler programming to check for failures explicitly
Diffstat (limited to 'jrt_test/src/tests/rpc-error/rpc-error_test.sh')
| -rwxr-xr-x | jrt_test/src/tests/rpc-error/rpc-error_test.sh | 12 |
1 files changed, 8 insertions, 4 deletions
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 c9f47cf10fa..bee324273b1 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,6 @@ #!/bin/bash -set -e + +fail=0 . ../../binref/env.sh @@ -10,7 +11,10 @@ CPP_PORT=$PORT_4 export JAVA_PORT export CPP_PORT -$BINREF/compilejava TestErrors.java +$BINREF/compilejava TestErrors.java || fail=1 + +bash ./dotest.sh || fail=1 + +$BINREF/progctl.sh progdefs.sh stop all -bash -e dotest.sh || (bash -e $BINREF/progctl.sh progdefs.sh stop all; false) -bash -e $BINREF/progctl.sh progdefs.sh stop all +exit $fail |