[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-671-ga5e77ca

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=a5e77cacea50a8ff2b9f2805f466d51c2813b449

The branch, master has been updated
       via  a5e77cacea50a8ff2b9f2805f466d51c2813b449 (commit)
       via  0536a861b2bad9563b729cc36145b2c9796c681e (commit)
      from  d905a94e6c749821aecc889d08e07c94f5354c40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a5e77cacea50a8ff2b9f2805f466d51c2813b449
Merge: d905a94 0536a86
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Jan 20 21:47:06 2011 +0100

    Merge branch 'tests-init'
    
    * tests-init:
      tests: revert not turning off errexit in instspc-test.sh

commit 0536a861b2bad9563b729cc36145b2c9796c681e
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Jan 20 21:46:22 2011 +0100

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |    6 ++++++
 tests/instspc-tests.sh |    6 +++++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5282a31..f3611e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-20  Ralf Wildenhues  <address@hidden>
+
+       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  <address@hidden>
 
        tests: work around Tru64 sh -e issues for instspc*.test.
diff --git a/tests/instspc-tests.sh b/tests/instspc-tests.sh
index 78f40c4..38a63a4 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


hooks/post-receive
-- 
GNU Automake