[FYI] {testsuite-work} tests: make 'subst-no-trailing-empty-line.test' more robust

[Stefano Lattarini]

* tests/subst-no-trailing-empty-line.test: Strengthen existing
checks, to try more scenarios and be slightly stricter in some
grepping checks.
---
 ChangeLog                               |    7 +++++++
 tests/subst-no-trailing-empty-line.test |   18 +++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 37f029c..26e43d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-06-24  Stefano Lattarini  <address@hidden>
 
+       tests: make 'subst-no-trailing-empty-line.test' more robust
+       * tests/subst-no-trailing-empty-line.test: Strengthen existing
+       checks, to try more scenarios and be slightly stricter in some
+       grepping checks.
+
+2011-06-24  Stefano Lattarini  <address@hidden>
+
        tests: fix an incomplete comment
        * tests/subst-no-trailing-empty-line.test: Fix an incomplete
        comment, and move it to a more proper place.  Minor cosmetic
diff --git a/tests/subst-no-trailing-empty-line.test 
b/tests/subst-no-trailing-empty-line.test
index a970174..c638b54 100755
--- a/tests/subst-no-trailing-empty-line.test
+++ b/tests/subst-no-trailing-empty-line.test
@@ -47,8 +47,11 @@ AUTOMAKE_OPTIONS = no-dependencies
 CC = false
 EXEEXT =
 
+## The "x" and "zardoz" strings and the use of '+=' are there to ensure
+## that these variables get rewritten by Automake.
 noinst_PROGRAMS = x @$v1@ @$v2@ @$v3@
-bin_PROGRAMS = @A@ mu @$v2@ @$v3@
+bin_PROGRAMS = @A@
+bin_PROGRAMS += @$v1@ @$v2@ @$v3@
 check_PROGRAMS = zardoz \$(noinst_PROGRAMS)
 
 ## Required whenever there are @substituted@ values in the
@@ -67,13 +70,14 @@ $AUTOMAKE
 # For debugging.
 $EGREP -n 'ABCD|am__empty' Makefile.in
 # Sanity check.
-test `$EGREP -c "^[ address@hidden@ @address@hidden $tab]*$bs?$" Makefile.in` 
-eq 2
+test `$EGREP -c "^[ address@hidden@ @address@hidden $tab]*$bs?$" Makefile.in` 
-eq 3
 
 ./configure
 {
-  sed -n '/^noinst_PROGRAMS =/,/[^\\]$/p' Makefile
-  sed -n '/^bin_PROGRAMS =/,/[^\\]$/p' Makefile
-  sed -n '/^check_PROGRAMS =/,/[^\\]$/p' Makefile
+  sed -n '/^noinst_PROGRAMS *=/,/[^\\]$/p' Makefile
+  sed -n '/^bin_PROGRAMS *=/,/[^\\]$/p' Makefile
+  sed -n '/^check_PROGRAMS *=/,/[^\\]$/p' Makefile
+  sed -n '/^am__EXEEXT.*=/,/[^\\]$/p' Makefile
 } >t-programs
 cat t-programs
 grep '^ *$' t-programs && Exit 1
@@ -81,13 +85,13 @@ grep '^ *$' t-programs && Exit 1
 $MAKE print-programs >stdout || { cat stdout; Exit 1; }
 cat stdout
 grep '^BEG1: x :END1$' stdout
-grep '^BEG2: mu :END2$' stdout
+grep '^BEG2: :END2$' stdout
 grep '^BEG3: zardoz x :END3$' stdout
 
 am__empty=X $MAKE -e print-programs >stdout || { cat stdout; Exit 1; }
 cat stdout
 grep '^BEG1: x X :END1$' stdout
-grep '^BEG2: mu X :END2$' stdout
+grep '^BEG2: X :END2$' stdout
 grep '^BEG3: zardoz x X :END3$' stdout
 
 :
-- 
1.7.2.3