From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 25 Apr 2010 12:17:27 +0000 (+0200)
Subject: Fix autotest testsuite -v output to print test group title.
X-Git-Tag: v2.66~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60da8c0ad73526f7aa345890455953a10d0bd5cb;p=thirdparty%2Fautoconf.git

Fix autotest testsuite -v output to print test group title.

* lib/autotest/general.m4 (AT_CLEANUP): Actually print test
title in verbose output.  Fixes AUTOCONF-2.57-101-gc102ed8
regression.
* tests/autotest.at (AT_CHECK_AT_TITLE): Amend macro to check
for test title in -v output.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 85d2b11a..c3ab2544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix autotest testsuite -v output to print test group title.
+	* lib/autotest/general.m4 (AT_CLEANUP): Actually print test
+	title in verbose output.  Fixes AUTOCONF-2.57-101-gc102ed8
+	regression.
+	* tests/autotest.at (AT_CHECK_AT_TITLE): Amend macro to check
+	for test title in -v output.
+
 2010-04-26  Eric Blake  <eblake@redhat.com>
 
 	Clarify octal escapes with tr.
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index c12f7d9e..1aa147d8 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1846,7 +1846,7 @@ m4_divert_pop([TEST_SCRIPT])dnl Back to TEST_GROUPS
 AT_xfail
 echo "#                             -*- compilation -*-" >> "$at_group_log"
 (
-  AS_ECHO(["AT_ordinal. m4_defn([AT_line]): testing $1..."])
+  AS_ECHO(["AT_ordinal. m4_defn([AT_line]): testing $at_desc ..."])
   $at_traceon
 m4_undivert([TEST_SCRIPT])dnl Insert the code here
   set +x
diff --git a/tests/autotest.at b/tests/autotest.at
index 4eca4b0e..d92aa1ad 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -674,6 +674,10 @@ s/^.\{]]]m4_default($5, 53)[[[\}ok.*/ok/p
 [[$3
 ok
 ]])
+AT_CHECK([[$CONFIG_SHELL ./micro-suite -v |
+	    sed -n 's/.*testing \(.*\) \.\.\./\1/p']],,
+[[$3
+]])
 AT_CHECK([[$CONFIG_SHELL ./micro-suite -l |
 	   sed -n 's/.*[0-9]: [^	 ][^	 ]*[	 ][	 ]*\(.*[^	 ]\)[	 ]*/\1/p']],,
 [[$3