[FYI] {testsuite-work} tests: convert another test to TAP

[Stefano Lattarini]

* tests/primary-prefix-invalid-couples.test: Renamed ...
* tests/primary-prefix-invalid-couples.tap: ... to this, and
converted to the use of the TAP protocols (this requires only
very minimal changes this time).
* tests/list-of-tests.mk: Update.
---
 ChangeLog                                          |    9 +++++++++
 tests/Makefile.in                                  |    2 +-
 tests/list-of-tests.mk                             |    2 +-
 ...les.test => primary-prefix-invalid-couples.tap} |   17 ++++++++++++-----
 4 files changed, 23 insertions(+), 7 deletions(-)
 rename tests/{primary-prefix-invalid-couples.test => 
primary-prefix-invalid-couples.tap} (92%)

diff --git a/ChangeLog b/ChangeLog
index de0fa2c..9c19124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-09-11  Stefano Lattarini  <address@hidden>
 
+       tests: convert another test to TAP
+       * tests/primary-prefix-invalid-couples.test: Renamed ...
+       * tests/primary-prefix-invalid-couples.tap: ... to this, and
+       converted to the use of the TAP protocols (this requires only
+       very minimal changes this time).
+       * tests/list-of-tests.mk: Update.
+
+2011-09-11  Stefano Lattarini  <address@hidden>
+
        tests: fix spurious failure on fast machines
        * tests/aclocal-acdir.test: Avoid spurious failures due to caching
        issues, by cleaning the autom4te cache between all the aclocal
diff --git a/tests/Makefile.in b/tests/Makefile.in
index e9fa68d..101a193 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1052,7 +1052,7 @@ prefix.test \
 primary.test \
 primary2.test \
 primary3.test \
-primary-prefix-invalid-couples.test \
+primary-prefix-invalid-couples.tap \
 primary-prefix-valid-couples.test \
 primary-prefix-couples-force-valid.test \
 primary-prefix-couples-documented-valid.test \
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 6cadef4..2a27bd1 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -736,7 +736,7 @@ prefix.test \
 primary.test \
 primary2.test \
 primary3.test \
-primary-prefix-invalid-couples.test \
+primary-prefix-invalid-couples.tap \
 primary-prefix-valid-couples.test \
 primary-prefix-couples-force-valid.test \
 primary-prefix-couples-documented-valid.test \
diff --git a/tests/primary-prefix-invalid-couples.test 
b/tests/primary-prefix-invalid-couples.tap
similarity index 92%
rename from tests/primary-prefix-invalid-couples.test
rename to tests/primary-prefix-invalid-couples.tap
index 4791707..b51fca3 100755
--- a/tests/primary-prefix-invalid-couples.test
+++ b/tests/primary-prefix-invalid-couples.tap
@@ -22,6 +22,8 @@
 
 . ./defs || Exit 1
 
+plan_ "later"
+
 oIFS=$IFS # Saved for later.
 
 : > ltmain.sh
@@ -40,7 +42,7 @@ AM_PATH_PYTHON
 AM_PATH_LISPDIR
 END
 
-$ACLOCAL
+$ACLOCAL || fatal_ "aclocal failure"
 
 # Please keep this list in sync with the list of "Directory Variables"
 # in the GNU Coding Standards and with the list additional directory
@@ -163,14 +165,18 @@ cat Makefile.am
 
 set -x # Restore shell xtraces from now on.
 
-AUTOMAKE_fails -a
+AUTOMAKE_fails \
+  -d "'automake -a' error out on mismatched prefix/primary couples" \
+  -- --add-missing
 
 while read lineno prefix primary; do
   test -n "$prefix" && test -n "$primary" && test 0 -lt $lineno \
     || fatal_ "internal error in 'all.list'"
   grep "^${prefix}_${primary}$" allow.list >/dev/null && continue
   errmsg_rx=".*${prefix}dir.* not a legitimate directory .*$primary"
-  grep "^Makefile\\.am:$lineno: $errmsg_rx" stderr || Exit 1
+  command_ok_ \
+    "mismatched prefix/primary in ${prefix}_${primary}" \
+    grep "^Makefile\\.am:$lineno: $errmsg_rx" stderr
 done <all.list
 
 # Check that automake really failed only for the expected reason(s).
@@ -179,7 +185,8 @@ grep -v 'dir.* not a legitimate directory' stderr && Exit 1
 # Check that the same failures are present without the `--add-missing'
 # option.
 mv stderr stderr.old
-AUTOMAKE_fails
-diff stderr.old stderr
+AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples"
+command_ok_ "... and with the same diagnostic of 'automake -a'" \
+            diff stderr.old stderr
 
 :
-- 
1.7.2.3