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/mockup-invoke/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/mockup-invoke/dotest.sh')
| -rw-r--r-- | jrt_test/src/tests/mockup-invoke/dotest.sh | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/jrt_test/src/tests/mockup-invoke/dotest.sh b/jrt_test/src/tests/mockup-invoke/dotest.sh index fcbdc16f92e..f7fcf007c56 100644 --- a/jrt_test/src/tests/mockup-invoke/dotest.sh +++ b/jrt_test/src/tests/mockup-invoke/dotest.sh @@ -1,20 +1,19 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e -sh $BINREF/progctl.sh progdefs.sh start server 1 +fail=0 -$BINREF/runjava PollRPCServer tcp/localhost:$PORT_0 -$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 aaa bbb > out.txt -$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 bbb ccc >> out.txt -$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 ccc ddd >> out.txt -$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 ddd eee >> out.txt -$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 eee fff >> out.txt +$BINREF/progctl.sh progdefs.sh start server 1 -sh $BINREF/progctl.sh progdefs.sh stop server 1 +$BINREF/runjava PollRPCServer tcp/localhost:$PORT_0 || fail=1 +$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 aaa bbb > out.txt || fail=1 +$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 bbb ccc >> out.txt || fail=1 +$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 ccc ddd >> out.txt || fail=1 +$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 ddd eee >> out.txt || fail=1 +$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 eee fff >> out.txt || fail=1 -if diff -u out.txt ref.txt; then - exit 0 -else - exit 1 -fi +$BINREF/progctl.sh progdefs.sh stop server 1 + +diff -u out.txt ref.txt || fail=1 + +exit $fail |