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 /messagebus | |
| 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 'messagebus')
| -rwxr-xr-x | messagebus/test/src/tests/error/ctl.sh | 4 | ||||
| -rw-r--r-- | messagebus/test/src/tests/error/progdefs.sh | 2 | ||||
| -rwxr-xr-x | messagebus/test/src/tests/speed/ctl.sh | 4 | ||||
| -rw-r--r-- | messagebus/test/src/tests/speed/progdefs.sh | 2 | ||||
| -rwxr-xr-x | messagebus/test/src/tests/trace/ctl.sh | 4 | ||||
| -rw-r--r-- | messagebus/test/src/tests/trace/progdefs.sh | 2 |
6 files changed, 6 insertions, 12 deletions
diff --git a/messagebus/test/src/tests/error/ctl.sh b/messagebus/test/src/tests/error/ctl.sh index 22178638fe1..864be4290ed 100755 --- a/messagebus/test/src/tests/error/ctl.sh +++ b/messagebus/test/src/tests/error/ctl.sh @@ -1,4 +1,4 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e -bash -e ../../binref/progctl.sh progdefs.sh "$@" + +exec ../../binref/progctl.sh progdefs.sh "$@" diff --git a/messagebus/test/src/tests/error/progdefs.sh b/messagebus/test/src/tests/error/progdefs.sh index 92cf767d495..2f6f37a9425 100644 --- a/messagebus/test/src/tests/error/progdefs.sh +++ b/messagebus/test/src/tests/error/progdefs.sh @@ -1,5 +1,3 @@ -#!/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 server cpp "" "./messagebus_test_cpp-server-error_app" prog server java "" "../../binref/runjava JavaServer" diff --git a/messagebus/test/src/tests/speed/ctl.sh b/messagebus/test/src/tests/speed/ctl.sh index 22178638fe1..864be4290ed 100755 --- a/messagebus/test/src/tests/speed/ctl.sh +++ b/messagebus/test/src/tests/speed/ctl.sh @@ -1,4 +1,4 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e -bash -e ../../binref/progctl.sh progdefs.sh "$@" + +exec ../../binref/progctl.sh progdefs.sh "$@" diff --git a/messagebus/test/src/tests/speed/progdefs.sh b/messagebus/test/src/tests/speed/progdefs.sh index ea6e05713f5..4e0390142cf 100644 --- a/messagebus/test/src/tests/speed/progdefs.sh +++ b/messagebus/test/src/tests/speed/progdefs.sh @@ -1,5 +1,3 @@ -#!/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 server cpp "" "./messagebus_test_cpp-server-speed_app" prog server java "" "../../binref/runjava JavaServer" diff --git a/messagebus/test/src/tests/trace/ctl.sh b/messagebus/test/src/tests/trace/ctl.sh index 22178638fe1..864be4290ed 100755 --- a/messagebus/test/src/tests/trace/ctl.sh +++ b/messagebus/test/src/tests/trace/ctl.sh @@ -1,4 +1,4 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e -bash -e ../../binref/progctl.sh progdefs.sh "$@" + +exec ../../binref/progctl.sh progdefs.sh "$@" diff --git a/messagebus/test/src/tests/trace/progdefs.sh b/messagebus/test/src/tests/trace/progdefs.sh index b3562f50bdd..fd35b6503e2 100644 --- a/messagebus/test/src/tests/trace/progdefs.sh +++ b/messagebus/test/src/tests/trace/progdefs.sh @@ -1,6 +1,4 @@ -#!/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 server cpp1 "" "./messagebus_test_cpp-server-trace_app server/cpp/1/A" prog server cpp2 "" "./messagebus_test_cpp-server-trace_app server/cpp/2/A" prog server cpp3 "" "./messagebus_test_cpp-server-trace_app server/cpp/2/B" |