11 files changed, 20 insertions, 6 deletions
diff --git a/messagebus/test/src/tests/compile-java/compile-java_test.sh b/messagebus/test/src/tests/compile-java/compile-java_test.sh
index f3da918eae1..9b94ffd51a1 100755
--- a/messagebus/test/src/tests/compile-java/compile-java_test.sh
+++ b/messagebus/test/src/tests/compile-java/compile-java_test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 . ../../binref/env.sh
 
 $BINREF/compilejava TestCompile.java
diff --git a/messagebus/test/src/tests/error/ctl.sh b/messagebus/test/src/tests/error/ctl.sh
index ea969749808..22178638fe1 100755
--- a/messagebus/test/src/tests/error/ctl.sh
+++ b/messagebus/test/src/tests/error/ctl.sh
@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-sh ../../binref/progctl.sh progdefs.sh "$@"
+set -e
+bash -e ../../binref/progctl.sh progdefs.sh "$@"
diff --git a/messagebus/test/src/tests/error/error_test.sh b/messagebus/test/src/tests/error/error_test.sh
index bd9ea35643d..e2b567f5823 100755
--- a/messagebus/test/src/tests/error/error_test.sh
+++ b/messagebus/test/src/tests/error/error_test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 . ../../binref/env.sh
 
 $BINREF/compilejava JavaServer.java
diff --git a/messagebus/test/src/tests/error/progdefs.sh b/messagebus/test/src/tests/error/progdefs.sh
index 2f6f37a9425..92cf767d495 100644
--- a/messagebus/test/src/tests/error/progdefs.sh
+++ b/messagebus/test/src/tests/error/progdefs.sh
@@ -1,3 +1,5 @@
+#!/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/errorcodes/errorcodes_test.sh b/messagebus/test/src/tests/errorcodes/errorcodes_test.sh
index 186de0a5033..7c30378cd1a 100644
--- a/messagebus/test/src/tests/errorcodes/errorcodes_test.sh
+++ b/messagebus/test/src/tests/errorcodes/errorcodes_test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 . ../../binref/env.sh
 
 $BINREF/compilejava DumpCodes.java
diff --git a/messagebus/test/src/tests/speed/ctl.sh b/messagebus/test/src/tests/speed/ctl.sh
index ea969749808..22178638fe1 100755
--- a/messagebus/test/src/tests/speed/ctl.sh
+++ b/messagebus/test/src/tests/speed/ctl.sh
@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-sh ../../binref/progctl.sh progdefs.sh "$@"
+set -e
+bash -e ../../binref/progctl.sh progdefs.sh "$@"
diff --git a/messagebus/test/src/tests/speed/progdefs.sh b/messagebus/test/src/tests/speed/progdefs.sh
index 4e0390142cf..ea6e05713f5 100644
--- a/messagebus/test/src/tests/speed/progdefs.sh
+++ b/messagebus/test/src/tests/speed/progdefs.sh
@@ -1,3 +1,5 @@
+#!/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/speed/speed_test.sh b/messagebus/test/src/tests/speed/speed_test.sh
index f9789961fa7..77eb7e63e0c 100644
--- a/messagebus/test/src/tests/speed/speed_test.sh
+++ b/messagebus/test/src/tests/speed/speed_test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 . ../../binref/env.sh
 
diff --git a/messagebus/test/src/tests/trace/ctl.sh b/messagebus/test/src/tests/trace/ctl.sh
index ea969749808..22178638fe1 100755
--- a/messagebus/test/src/tests/trace/ctl.sh
+++ b/messagebus/test/src/tests/trace/ctl.sh
@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-sh ../../binref/progctl.sh progdefs.sh "$@"
+set -e
+bash -e ../../binref/progctl.sh progdefs.sh "$@"
diff --git a/messagebus/test/src/tests/trace/progdefs.sh b/messagebus/test/src/tests/trace/progdefs.sh
index fd35b6503e2..b3562f50bdd 100644
--- a/messagebus/test/src/tests/trace/progdefs.sh
+++ b/messagebus/test/src/tests/trace/progdefs.sh
@@ -1,4 +1,6 @@
+#!/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"
diff --git a/messagebus/test/src/tests/trace/trace_test.sh b/messagebus/test/src/tests/trace/trace_test.sh
index bfb2edbf870..63005385332 100644
--- a/messagebus/test/src/tests/trace/trace_test.sh
+++ b/messagebus/test/src/tests/trace/trace_test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 . ../../binref/env.sh