Avoid a test failure when the test wants to skip itself.

diff --git a/ChangeLog b/ChangeLog
index 8d5771dced6d18af3c762e1a4d71b241e67cf02e..0e6fdf69b2f850bcf3c5d5c2450dbe9ee3b4f656 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-10  Bruno Haible  <bruno@clisp.org>
+
+       * tests/test-vc-list-files-git.sh: Make double use of 'exit'. Needed
+       for $? to work inside the trap command, with various /bin/sh-s.
+       * tests/test-vc-list-files-cvs.sh: Likewise.
+
 2008-06-10  Bruno Haible  <bruno@clisp.org>
 
        * lib/acl-internal.h: Don't include gettext.h here.

diff --git a/tests/test-vc-list-files-cvs.sh b/tests/test-vc-list-files-cvs.sh
index c94932fc27e03e55d3c6325deece583a03d3d007..c87267cde358c1a7e85e65a464e91176e35486c5 100755 (executable)
--- a/tests/test-vc-list-files-cvs.sh
+++ b/tests/test-vc-list-files-cvs.sh
@@ -44,7 +44,8 @@ for i in with-cvsu without; do
   ok=0
   mkdir $tmpdir && cd $tmpdir &&
     # without cvs, skip the test
-    { ( cvs -Q -d "$repo" init ) > /dev/null 2>&1 || exit 77; } &&
+    # The double use of 'exit' is needed for the reference to $? inside the trap.
+    { ( cvs -Q -d "$repo" init ) > /dev/null 2>&1 || { (exit 77); exit 77; }; } &&
     mkdir w && cd w &&
     mkdir d &&
     touch d/a b c &&

diff --git a/tests/test-vc-list-files-git.sh b/tests/test-vc-list-files-git.sh
index 3a669dd0e31931d90dd0c918a0c58ae548fcf18e..ac50971db19580768a2241db33e73b18b820b718 100755 (executable)
--- a/tests/test-vc-list-files-git.sh
+++ b/tests/test-vc-list-files-git.sh
@@ -31,7 +31,8 @@ trap '(exit $?); exit $?' 1 2 13 15
 fail=1
 mkdir $tmpdir && cd $tmpdir &&
   # without git, skip the test
-  { ( git init -q ) > /dev/null 2>&1 || exit 77; } &&
+  # The double use of 'exit' is needed for the reference to $? inside the trap.
+  { ( git init -q ) > /dev/null 2>&1 || { (exit 77); exit 77; }; } &&
   mkdir d &&
   touch d/a b c &&
   git add . > /dev/null &&