tests: revert not turning off errexit in instspc-test.sh

* tests/instspc-tests.sh: Turn off errexit while sourcing defs,
the scripts might still not be clean.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 2552580125756ecb51c193374909c03d9b228743..4faa135e4df32720ae2db78c0c7bf45737690187 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       tests: revert not turning off errexit in instspc-test.sh
+       * tests/instspc-tests.sh: Turn off errexit while sourcing defs,
+       the scripts might still not be clean.
+
 2011-01-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        tests: work around Tru64 sh -e issues for instspc*.test.

diff --git a/tests/instspc-tests.sh b/tests/instspc-tests.sh
index 78f40c4c25f756bb533147f8e471d3d81043d0a5..38a63a46fc175b83881f362177a05944d7157f7f 100755 (executable)
--- a/tests/instspc-tests.sh
+++ b/tests/instspc-tests.sh
@@ -191,8 +191,12 @@ fi
 
 ###  If we are still here, we have to run a test ...
 
-# We'll need the full setup provided by `tests/defs'.
+# We'll need the full setup provided by `tests/defs'.  Temporarly disable
+# the errexit flag, since the setup code might not be prepared to deal
+# with it.
+set +e
 . ./defs || Exit 99
+set -e
 
 eval "instspc_test_string=\${instspc__$instspc_test_name}" || Exit 99
 if test x"$instspc_test_string" = x; then