tests: set fail=0 at start

* tests/init.sh (setup_): Move fail=0 initialization here ...
(mktempd_): ... from here, so that tests can rely on fail being
set to 0 initially.  This fixes a problem in coreutils; see:
http://lists.gnu.org/archive/html/coreutils/2010-12/msg00083.html

diff --git a/ChangeLog b/ChangeLog
index 8b021751ed90dfd21af86c99817de471c98dd316..1ee355cc039cb613d79e46a9911c8849329e14d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+       tests: set fail=0 at start
+       * tests/init.sh (setup_): Move fail=0 initialization here ...
+       (mktempd_): ... from here, so that tests can rely on fail being
+       set to 0 initially.  This fixes a problem in coreutils; see:
+       http://lists.gnu.org/archive/html/coreutils/2010-12/msg00083.html
+
 2010-12-18  Bruno Haible  <bruno@clisp.org>
 
        memmem-simple: Stylistic changes.

diff --git a/tests/init.sh b/tests/init.sh
index 14f3b198d43d2b3677f17fb489f7324f9de2183b..4d89a1af6db070f231a195b00204609d38a4d509 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -324,6 +324,7 @@ setup_()
   fi
 
   initial_cwd_=$PWD
+  fail=0
 
   pfx_=`testdir_prefix_`
   test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
@@ -416,8 +417,6 @@ mktempd_()
   *) fail_ "invalid template: $template_ (must have a suffix of at least 4 X's)";;
   esac
 
-  fail=0
-
   # First, try to use mktemp.
   d=`unset TMPDIR; mktemp -d -t -p "$destdir_" "$template_" 2>/dev/null` \
     || fail=1