tests: fix logic bug in init.sh

If the shell test loop first finds a marginal then a good shell, the
variable $gl_set_x_corrupts_stderr is still set to true and needlessly
drops $VERBOSE logging.

* tests/init.sh: (gl_set_x_corrupts_stderr_): Clear for successful
shell.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 4db03d6055ae43d45d48cff7ef6092aaf2897c9a..ee6c667d21c5658fa11ef6e0b2a5380e30eb8b6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-24  Eric Blake  <eblake@redhat.com>
+
+       tests: fix logic bug in init.sh
+       * tests/init.sh: (gl_set_x_corrupts_stderr_): Clear for successful
+       shell.
+
 2011-05-24  Jim Meyering  <meyering@redhat.com>
 
        utimensat: do not reference an out-of-scope buffer
@@ -5,8 +11,8 @@
        declared in an inner scope, yet "times" would be dereferenced outside
        the scope in which "ts" was valid.
        * lib/utimensat.c (rpl_utimensat) [__linux__]: Move the declaration
-       of ts[2] "out/up", so that the use of aliased "times" (via "times = ts;")
-       does not end up referencing an out-of-scope "ts"
+       of ts[2] "out/up", so that the use of aliased "times" (via
+       "times = ts;") does not end up referencing an out-of-scope "ts"
 
        opendir-safer.c: don't clobber errno; don't close negative FD
        * lib/opendir-safer.c (opendir_safer):

diff --git a/tests/init.sh b/tests/init.sh
index 71c6516962a9da5ff159ea7fbd3f51261f6b94e3..294dcdd0f62c58432542749b0dd1729d28c168d4 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -167,7 +167,10 @@ else
     st_=$?
 
     # $re_shell_ works just fine.  Use it.
-    test $st_ = 10 && break
+    if test $st_ = 10; then
+      gl_set_x_corrupts_stderr_=false
+      break
+    fi
 
     # If this is our first marginally acceptable shell, remember it.
     if test "$st_:$marginal_" = 9: ; then