[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-965-g1ed4830

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=1ed48303b1c6f7a086a60b3b99bfafc25fbde3aa

The branch, testsuite-work has been updated
       via  1ed48303b1c6f7a086a60b3b99bfafc25fbde3aa (commit)
       via  9bee10d186e2c9600f75779a19e03ad3b1a5b283 (commit)
       via  e19e13d75dcd1b4fcba1feeeabd77e02ab3932b1 (commit)
       via  975cae17a1626994cde495b6890bbd2481cfeacd (commit)
       via  1429b5682e4c42eda02a884a4d6243ec3b042c5b (commit)
       via  42a9c4db8dc4624dc2b59d1f9a3efb45e359c12e (commit)
      from  89b9f35abff0facb71f040444ff5653a8e98b58d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1ed48303b1c6f7a086a60b3b99bfafc25fbde3aa
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jun 24 10:14:30 2011 +0200

    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.

commit 9bee10d186e2c9600f75779a19e03ad3b1a5b283
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jun 24 09:50:30 2011 +0200

    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
    fixes to other comments.

commit e19e13d75dcd1b4fcba1feeeabd77e02ab3932b1
Merge: 1429b56 975cae1
Author: Stefano Lattarini <address@hidden>
Date:   Mon Jun 20 17:00:54 2011 +0200

    Merge branch 'master' into testsuite-work
    
    * master:
      maintcheck: avoid few spurious failures

commit 1429b5682e4c42eda02a884a4d6243ec3b042c5b
Author: Stefano Lattarini <address@hidden>
Date:   Mon Jun 20 16:58:22 2011 +0200

    maintcheck: avoid few spurious failures
    
    * tests/depmod-data.test: Use creative quoting to avoid
    spuriously triggering the `sc_tests_Exit_not_exit' maintainer
    check.  Commit `v1.11-900-g3453b8e' attempted to fix it, but
    succeeded only partially.
    * tests/cond33.test: Fix header comments, not to reference
    obsolescent make variable `$(mkdir_p)'.
    * tests/cond4.test: Rewrite "$MAKE exp=..." as "exp=.. $MAKE -e",
    to please `sc_tests_overriding_macros_on_cmdline'
    * tests/cond19.test: Likewise.
    * tests/cond32.test: Likewise.
    * tests/add-missing.test: Use "AUTOMAKE_fails" instead of
    "$AUTOMAKE ... && Exit 1", to please `sc_tests_automake_fails'.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                               |   38 +++++++++++++++++++++++++++++++
 Makefile.am                             |   10 ++++----
 Makefile.in                             |   10 ++++----
 tests/add-missing.test                  |    3 +-
 tests/cond19.test                       |    8 +++---
 tests/cond32.test                       |    6 ++--
 tests/cond33.test                       |    4 +-
 tests/cond4.test                        |    8 +++---
 tests/depmod-data.test                  |    2 +-
 tests/subst-no-trailing-empty-line.test |   32 ++++++++++++++++---------
 10 files changed, 83 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a5c4aa..26e43d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+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
+       fixes to other comments.
+
+2011-06-20  Stefano Lattarini  <address@hidden>
+
+       maintcheck: avoid few more spurious failures
+       * tests/depmod-data.test: Use creative quoting to avoid
+       spuriously triggering the `sc_tests_Exit_not_exit' maintainer
+       check.  Commit `v1.11-900-g3453b8e' attempted to fix it, but
+       succeeded only partially.
+       * tests/cond33.test: Fix header comments, not to reference
+       obsolescent make variable `$(mkdir_p)'.
+       * tests/cond4.test: Rewrite "$MAKE exp=..." as "exp=.. $MAKE -e",
+       to please `sc_tests_overriding_macros_on_cmdline'
+       * tests/cond19.test: Likewise.
+       * tests/cond32.test: Likewise.
+       * tests/add-missing.test: Use "AUTOMAKE_fails" instead of
+       "$AUTOMAKE ... && Exit 1", to please `sc_tests_automake_fails'.
+
+2011-06-20  Stefano Lattarini  <address@hidden>
+
+       maintcheck: avoid few spurious failures
+       * Makefile.am (sc_tests_plain_aclocal, sc_tests_plain_perl,
+       sc_tests_plain_autoconf, sc_tests_plain_automake,
+       sc_tests_plain_autoupate): Be stricter in matching an erroneous
+       literal command, i.e., `aclocal', `automake', `perl', etc.
+
 2011-06-20  Bert Wesarg <address@hidden>  (tiny change)
 
        check: don't use multi-line coloring for the report
diff --git a/Makefile.am b/Makefile.am
index fe093fc..94c732c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -438,21 +438,21 @@ sc_tests_plain_make:
 
 ## Tests should never call autoconf directly.
 sc_tests_plain_autoconf:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*autoconf'; 
then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*autoconf\>'; 
then \
          echo 'Do not run "autoconf" in the above tests.  Use "$$AUTOCONF" 
instead.' 1>&2; \
          exit 1; \
        fi
 
 ## Tests should never call autoupdate directly.
 sc_tests_plain_autoupdate:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*autoupdate'; 
then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      
]*autoupdate\>'; then \
          echo 'Do not run "autoupdate" in the above tests.  Use "$$AUTOUPDATE" 
instead.' 1>&2; \
          exit 1; \
        fi
 
 ## Tests should never call automake directly.
 sc_tests_plain_automake:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[   
]*automake([^:]|$$)'; then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[   
]*automake\>([^:]|$$)'; then \
          echo 'Do not run "automake" in the above tests.  Use "$$AUTOMAKE" 
instead.' 1>&2;  \
          exit 1; \
        fi
@@ -492,14 +492,14 @@ sc_tests_automake_fails:
 
 ## Tests should never call aclocal directly.
 sc_tests_plain_aclocal:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*aclocal'; 
then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*aclocal\>'; 
then \
          echo 'Do not run "aclocal" in the above tests.  Use "$$ACLOCAL" 
instead.' 1>&2;  \
          exit 1; \
        fi
 
 ## Tests should never call perl directly.
 sc_tests_plain_perl:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*perl'; then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*perl\>'; then 
\
          echo 'Do not run "perl" in the above tests.  Use "$$PERL" instead.' 
1>&2; \
          exit 1; \
        fi
diff --git a/Makefile.in b/Makefile.in
index 30a73f2..30fe9e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1187,19 +1187,19 @@ sc_tests_plain_make:
        fi
 
 sc_tests_plain_autoconf:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*autoconf'; 
then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*autoconf\>'; 
then \
          echo 'Do not run "autoconf" in the above tests.  Use "$$AUTOCONF" 
instead.' 1>&2; \
          exit 1; \
        fi
 
 sc_tests_plain_autoupdate:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*autoupdate'; 
then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      
]*autoupdate\>'; then \
          echo 'Do not run "autoupdate" in the above tests.  Use "$$AUTOUPDATE" 
instead.' 1>&2; \
          exit 1; \
        fi
 
 sc_tests_plain_automake:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[   
]*automake([^:]|$$)'; then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep -E ':[   
]*automake\>([^:]|$$)'; then \
          echo 'Do not run "automake" in the above tests.  Use "$$AUTOMAKE" 
instead.' 1>&2;  \
          exit 1; \
        fi
@@ -1232,13 +1232,13 @@ sc_tests_automake_fails:
        fi
 
 sc_tests_plain_aclocal:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*aclocal'; 
then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*aclocal\>'; 
then \
          echo 'Do not run "aclocal" in the above tests.  Use "$$ACLOCAL" 
instead.' 1>&2;  \
          exit 1; \
        fi
 
 sc_tests_plain_perl:
-       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*perl'; then \
+       @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[      ]*perl\>'; then 
\
          echo 'Do not run "perl" in the above tests.  Use "$$PERL" instead.' 
1>&2; \
          exit 1; \
        fi
diff --git a/tests/add-missing.test b/tests/add-missing.test
index d6729f3..7e3d08c 100755
--- a/tests/add-missing.test
+++ b/tests/add-missing.test
@@ -141,8 +141,7 @@ check_ ()
     # If the required auxiliary files are missing, and automake is
     # not told to install them, it should complain and error out,
     # and also give a useful suggestion.
-    $AUTOMAKE 2>stderr && { cat stderr >&2; Exit 1; }
-    cat stderr >&2
+    AUTOMAKE_fails
     for f in $files; do 
       grep "required file ['\`]$build_aux/$f' not found" stderr
       # Suggest the user to use `--add-missing'.
diff --git a/tests/cond19.test b/tests/cond19.test
index 50ae9cb..ec69bfb 100755
--- a/tests/cond19.test
+++ b/tests/cond19.test
@@ -60,12 +60,12 @@ $AUTOCONF
 $AUTOMAKE -a -i
 
 CONDITION1=true CONDITION2=true ./configure
-$MAKE test exp='dlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o'
+exp='dlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o' $MAKE -e test
 CONDITION1=true CONDITION2=false ./configure
-$MAKE test exp='dlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o'
+exp='dlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o' $MAKE -e test
 CONDITION1=false CONDITION2=true ./configure
-$MAKE test exp='dlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o'
+exp='dlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o' $MAKE -e test
 CONDITION1=false CONDITION2=false ./configure
-$MAKE test exp='dlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o'
+exp='dlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o' $MAKE -e test
 
 :
diff --git a/tests/cond32.test b/tests/cond32.test
index 30fde11..45ecf70 100755
--- a/tests/cond32.test
+++ b/tests/cond32.test
@@ -61,12 +61,12 @@ $AUTOCONF
 $AUTOMAKE
 
 ./configure
-$MAKE test exp='foo.o nonsense.a'
+exp='foo.o nonsense.a' $MAKE -e test
 
 ./configure two=yes three=
-$MAKE test exp='bar.o'
+exp='bar.o' $MAKE -e test
 
 ./configure two=yes three=yes
-$MAKE test exp='baz.o'
+exp='baz.o' $MAKE -e test
 
 :
diff --git a/tests/cond33.test b/tests/cond33.test
index 149795d..5f454db 100755
--- a/tests/cond33.test
+++ b/tests/cond33.test
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check that $(mkdir_p) handles well conditionally-defined install
-# directories.
+# Check that conditionally-defined install directories are handled
+# correctly.
 # Report from Ralf Corsepius
 
 . ./defs || Exit 1
diff --git a/tests/cond4.test b/tests/cond4.test
index 7d2aaea..3071577 100755
--- a/tests/cond4.test
+++ b/tests/cond4.test
@@ -57,12 +57,12 @@ grep 'address@hidden@' Makefile.in && Exit 1
 $AUTOCONF
 
 CONDITION1=true CONDITION2=true ./configure
-$MAKE test exp='main.o one.o two.o'
+exp='main.o one.o two.o' $MAKE -e test
 CONDITION1=true CONDITION2=false ./configure
-$MAKE test exp='main.o one.o'
+exp='main.o one.o' $MAKE -e test
 CONDITION1=false CONDITION2=true ./configure
-$MAKE test exp='main.o two.o'
+exp='main.o two.o' $MAKE -e test
 CONDITION1=false CONDITION2=false ./configure
-$MAKE test exp='main.o'
+exp='main.o' $MAKE -e test
 
 :
diff --git a/tests/depmod-data.test b/tests/depmod-data.test
index 18c26eb..297c739 100755
--- a/tests/depmod-data.test
+++ b/tests/depmod-data.test
@@ -20,7 +20,7 @@
 
 # Ensure proper definition of $testsrcdir.
 # FIXME: we employ useless quoting below to please maintainer-check.
-. ./defs-static || exit 99
+. ./defs-static || 'exit' 99
 
 # Sanity check.
 if test x"$testsrcdir" = x; then
diff --git a/tests/subst-no-trailing-empty-line.test 
b/tests/subst-no-trailing-empty-line.test
index 595644e..c638b54 100755
--- a/tests/subst-no-trailing-empty-line.test
+++ b/tests/subst-no-trailing-empty-line.test
@@ -23,16 +23,19 @@
 
 . ./defs || Exit 1
 
+# These are deliberately quite long, so that the xxx_PROGRAMS definition
+# in Makefile.am below will be split on multiple lines, with the last
+# line containing only @substituted@ stuff that expands to empty (this is
+# required to expose the bug we are testing).
 v1=ABCDEFGHIJKLMNOPQRSTUVWX
 v2=ABCDEFGHIJKLMNOPQRSTUVWXY
 v3=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-bs='\\' # Literal backslash for grep.
+
+# Literal backslash for use by grep.
+bs='\\'
 
 cat >> configure.in <<END
 AC_SUBST([A], [''])
-# These are deliberately quite long, so that the xxx_PROGRAMS definition
-# in Makefile.am below will be split on multiple lines, with the last
-# line
 AC_SUBST([$v1], [''])
 AC_SUBST([$v2], [''])
 AC_SUBST([$v3], [''])
@@ -44,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
@@ -61,15 +67,17 @@ END
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
-$EGREP -n 'ABCD|am__empty' Makefile.in # For debugging,
+# 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
@@ -77,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
 
 :


hooks/post-receive
-- 
GNU Automake