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/slobrok-api/dotest.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/slobrok-api/dotest.sh')
| -rwxr-xr-x | jrt_test/src/tests/slobrok-api/dotest.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jrt_test/src/tests/slobrok-api/dotest.sh b/jrt_test/src/tests/slobrok-api/dotest.sh index 23fcc88edc5..d5a4a35647e 100755 --- a/jrt_test/src/tests/slobrok-api/dotest.sh +++ b/jrt_test/src/tests/slobrok-api/dotest.sh @@ -1,15 +1,15 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e -. ../../binref/env.sh +fail=0 -ret=true +. ../../binref/env.sh export PORT_8 -sh $BINREF/progctl.sh progdefs.sh start slobrok 1 -${BINREF}/runjava SlobrokAPITest tcp/localhost:${PORT_8} || ret=false -${BINREF}/sbcmd ${PORT_8} slobrok.system.stop -sh $BINREF/progctl.sh progdefs.sh stop slobrok 1 +$BINREF/progctl.sh progdefs.sh start slobrok 1 +$BINREF/runjava SlobrokAPITest tcp/localhost:${PORT_8} || fail=1 +$BINREF/sbcmd ${PORT_8} slobrok.system.stop +$BINREF/progctl.sh progdefs.sh stop slobrok 1 + +exit $fail -$ret |