FYI: have only one $VERBOSE mode in the test suite

[Alexandre Duret-Lutz]

I'm checking this in.  I'm always annoyed when a user sends some
debug output generated with VERBOSE=1 although I asked to use
VERBOSE=x.  But then, there is no reason to have two VERBOSE
modes when only one is useful.

2004-11-03  Alexandre Duret-Lutz  <address@hidden>

        * tests/defs.in: Do not distinguish VERBOSE=x from
        VERBOSE=anything_but_x, always turn on shell traces.

Index: tests/defs.in
===================================================================
RCS file: /cvs/automake/automake/tests/defs.in,v
retrieving revision 1.31
diff -u -r1.31 defs.in
--- tests/defs.in       12 Oct 2004 19:39:08 -0000      1.31
+++ tests/defs.in       3 Nov 2004 21:44:14 -0000
@@ -44,7 +44,7 @@
 
 # If srcdir is not set, then we are not running from `make check', be verbose.
 if test -z "$srcdir"; then
-   test -z "$VERBOSE" && VERBOSE=x
+   VERBOSE=x
    # compute $srcdir.
    srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'`
    test $srcdir = $0 && srcdir=.
@@ -335,8 +335,8 @@
   AUTOMAKE_run 1 ${1+"$@"}
 }
 
-# Turn on shell traces when VERBOSE=x.
-if test "x$VERBOSE" = xx; then
+# Turn on shell traces when VERBOSE is set.
+if test -n "$VERBOSE"; then
   set -x
 else
   :

-- 
Alexandre Duret-Lutz