diff options
Diffstat (limited to 'jrt_test/src/tests/mandatory-methods')
| -rw-r--r-- | jrt_test/src/tests/mandatory-methods/dotest.sh | 3 | ||||
| -rwxr-xr-x | jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh | 5 | ||||
| -rw-r--r-- | jrt_test/src/tests/mandatory-methods/progdefs.sh | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/jrt_test/src/tests/mandatory-methods/dotest.sh b/jrt_test/src/tests/mandatory-methods/dotest.sh index 25560a6210d..6c7dfb2bbea 100644 --- a/jrt_test/src/tests/mandatory-methods/dotest.sh +++ b/jrt_test/src/tests/mandatory-methods/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 javaserver 1 diff --git a/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh b/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh index 3088682ef91..81eb00776c8 100755 --- a/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh +++ b/jrt_test/src/tests/mandatory-methods/mandatory-methods_test.sh @@ -6,6 +6,5 @@ export PORT_1 $BINREF/compilejava RPCServer.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/mandatory-methods/progdefs.sh b/jrt_test/src/tests/mandatory-methods/progdefs.sh index aa7ae4ab3ca..a376f7585ab 100644 --- a/jrt_test/src/tests/mandatory-methods/progdefs.sh +++ b/jrt_test/src/tests/mandatory-methods/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 javaserver 1 "tcp/$PORT_1" "$BINREF/runjava RPCServer" |