From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 20 Jan 2011 20:46:22 +0000 (+0100)
Subject: tests: revert not turning off errexit in instspc-test.sh
X-Git-Tag: ng-0.5a~244^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0536a861b2bad9563b729cc36145b2c9796c681e;p=thirdparty%2Fautomake.git

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 255258012..4faa135e4 100644
--- 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 78f40c4c2..38a63a46f 100755
--- 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