diff options
author | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-06-28 13:20:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-28 13:20:00 +0200 |
commit | 7824d2b515cba557c9c4028591ede0b4b9256b77 (patch) | |
tree | 888581b502ba64706658ead749492708927d1b8a /jrt_test/src/tests/mockup-invoke | |
parent | 3962f601fa92e8aba19e3efc230840b9f4f5a5a7 (diff) |
Fail test scripts on first error (#194)
* Fail test scripts on first error
* Some more test fixes
* Reverted prod_features_test fix
* Re-added prod_features_test.sh change matching that of PR #193
* More error checking
* Reverted set -e on failing tests
* Enable errexit in lowercasing test
Diffstat (limited to 'jrt_test/src/tests/mockup-invoke')
-rw-r--r-- | jrt_test/src/tests/mockup-invoke/dotest.sh | 3 | ||||
-rwxr-xr-x | jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh | 4 | ||||
-rw-r--r-- | jrt_test/src/tests/mockup-invoke/progdefs.sh | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/jrt_test/src/tests/mockup-invoke/dotest.sh b/jrt_test/src/tests/mockup-invoke/dotest.sh index 3bd15b6437f..fcbdc16f92e 100644 --- a/jrt_test/src/tests/mockup-invoke/dotest.sh +++ b/jrt_test/src/tests/mockup-invoke/dotest.sh @@ -1,5 +1,6 @@ -#!/bin/sh +#!/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 diff --git a/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh b/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh index d5ac8535393..84343a7a60b 100755 --- a/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh +++ b/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh @@ -7,5 +7,5 @@ export PORT_0 $BINREF/compilejava MockupInvoke.java -sh dotest.sh || (sh $BINREF/progctl.sh progdefs.sh stop all; false) -sh $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 diff --git a/jrt_test/src/tests/mockup-invoke/progdefs.sh b/jrt_test/src/tests/mockup-invoke/progdefs.sh index 4c483b8060b..6898513badc 100644 --- a/jrt_test/src/tests/mockup-invoke/progdefs.sh +++ b/jrt_test/src/tests/mockup-invoke/progdefs.sh @@ -1,2 +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 1 "tcp/$PORT_0" "./jrt_test_mockup-server_app" |