From: Akim Demaille <akim@epita.fr>
Date: Mon, 15 Jan 2001 07:38:35 +0000 (+0000)
Subject: * tests/atgeneral.m4 (AT_INIT): Simplify the hairy display of the
X-Git-Tag: autoconf-2.50~267
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05ee2bf953fbb764c47b109b4afb9f4b3e2fa53e;p=thirdparty%2Fautoconf.git

* tests/atgeneral.m4 (AT_INIT): Simplify the hairy display of the
identity of the tests.
---

diff --git a/ChangeLog b/ChangeLog
index e0dbc16ee..f74a3b25e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-15  Akim Demaille  <akim@epita.fr>
+
+	* tests/atgeneral.m4 (AT_INIT): Simplify the hairy display of the
+	identity of the tests.
+
 2001-01-15  Akim Demaille  <akim@epita.fr>
 
 	* tests/atgeneral.m4 (AT_INIT): When the suite failed, complain
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index b91650f3a..317c976d7 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -111,6 +111,7 @@ test -f atlocal && . ./atlocal
 at_stop_on_error=false
 # Shall we be verbose?
 at_verbose=:
+at_quiet=echo
 # Shall we keep the debug scripts?  Must be `:' when testsuite is
 # run by a debug script, so that the script doesn't remove itself.
 at_debug=false
@@ -128,7 +129,7 @@ while test $[#] -gt 0; do
 
     -d) at_debug=:;;
     -e) at_stop_on_error=:;;
-    -v) at_verbose=echo;;
+    -v) at_verbose=echo; at_quiet=:;;
     -x) at_traceon='set -vx'; at_traceoff='set +vx';;
 
     [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]])
@@ -215,6 +216,8 @@ for at_test in $at_tests
 do
   at_status=0
   rm -rf $at_data_files
+  # Clearly separate the tests when verbose.
+  test $at_test_count != 0 && $at_verbose
   case $at_test in
 dnl Tests inserted here (TESTS).
 m4_divert([TAIL])[]dnl
@@ -223,7 +226,7 @@ m4_divert([TAIL])[]dnl
     banner-*) ;;
     *)
       at_test_count=`expr 1 + $at_test_count`
-      $at_verbose $at_n "     $at_test. $srcdir/`cat at-setup-line`: $at_c"
+      $at_verbose $at_n "$at_test. $srcdir/`cat at-setup-line`: $at_c"
       case $at_status in
         0) echo ok
            ;;
@@ -307,13 +310,8 @@ m4_divert_text([HELP],
 m4_divert_push([TESTS])dnl
   AT_ordinal ) [#] AT_ordinal. AT_LINE: $1
     echo AT_LINE >at-setup-line
-    $at_verbose 'testing $1'
-    $at_verbose $at_n "     $at_c"
-    if test $at_verbose = echo; then
-      echo "AT_ordinal. $srcdir/AT_LINE..."
-    else
-      echo $at_n "m4_substr(AT_ordinal. $srcdir/AT_LINE                            , 0, 30)[]$at_c"
-    fi
+    $at_verbose "AT_ordinal. $srcdir/AT_LINE: testing $1..."
+    $at_quiet $at_n "m4_format([%3d: %-18s], AT_ordinal, AT_LINE)[]$at_c"
     (
       $at_traceon
 ])
diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index b91650f3a..317c976d7 100644
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -111,6 +111,7 @@ test -f atlocal && . ./atlocal
 at_stop_on_error=false
 # Shall we be verbose?
 at_verbose=:
+at_quiet=echo
 # Shall we keep the debug scripts?  Must be `:' when testsuite is
 # run by a debug script, so that the script doesn't remove itself.
 at_debug=false
@@ -128,7 +129,7 @@ while test $[#] -gt 0; do
 
     -d) at_debug=:;;
     -e) at_stop_on_error=:;;
-    -v) at_verbose=echo;;
+    -v) at_verbose=echo; at_quiet=:;;
     -x) at_traceon='set -vx'; at_traceoff='set +vx';;
 
     [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]])
@@ -215,6 +216,8 @@ for at_test in $at_tests
 do
   at_status=0
   rm -rf $at_data_files
+  # Clearly separate the tests when verbose.
+  test $at_test_count != 0 && $at_verbose
   case $at_test in
 dnl Tests inserted here (TESTS).
 m4_divert([TAIL])[]dnl
@@ -223,7 +226,7 @@ m4_divert([TAIL])[]dnl
     banner-*) ;;
     *)
       at_test_count=`expr 1 + $at_test_count`
-      $at_verbose $at_n "     $at_test. $srcdir/`cat at-setup-line`: $at_c"
+      $at_verbose $at_n "$at_test. $srcdir/`cat at-setup-line`: $at_c"
       case $at_status in
         0) echo ok
            ;;
@@ -307,13 +310,8 @@ m4_divert_text([HELP],
 m4_divert_push([TESTS])dnl
   AT_ordinal ) [#] AT_ordinal. AT_LINE: $1
     echo AT_LINE >at-setup-line
-    $at_verbose 'testing $1'
-    $at_verbose $at_n "     $at_c"
-    if test $at_verbose = echo; then
-      echo "AT_ordinal. $srcdir/AT_LINE..."
-    else
-      echo $at_n "m4_substr(AT_ordinal. $srcdir/AT_LINE                            , 0, 30)[]$at_c"
-    fi
+    $at_verbose "AT_ordinal. $srcdir/AT_LINE: testing $1..."
+    $at_quiet $at_n "m4_format([%3d: %-18s], AT_ordinal, AT_LINE)[]$at_c"
     (
       $at_traceon
 ])