[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.11b-81-g239336d

[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=239336d2dc35bfac52f1f05edcdb229e5700c191

The branch, ng/master has been updated
       via  239336d2dc35bfac52f1f05edcdb229e5700c191 (commit)
      from  20c1d7d7ff68c8351fd8bb953371012168240279 (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 239336d2dc35bfac52f1f05edcdb229e5700c191
Author: Stefano Lattarini <address@hidden>
Date:   Tue Feb 21 17:14:29 2012 +0100

    [ng] tests: remove stale workarounds for non-GNU make
    
    * t/yacc-depend2.sh: Remove now-irrelevant comment about
    the fact that this test fails with FreeBSD make.
    * t/silent8.sh: Remove useless workaround for NetBSD make.
    * t/tap-signal.tap: Likewise.
    * t/posixsubst-ldadd.sh: Remove useless workaround for
    FreeBSD make.
    * t/posixsubst-libraries.sh: Likewise.
    * t/posixsubst-ltlibraries.sh: Likewise.
    * t/posixsubst-sources.sh: Likewise.
    * t/posixsubst-tests.sh: Likewise.
    * t/distcheck-outdated-m4.sh: Remove workaround for
    extra-verbose make implementations (like Solaris make).
    * t/distcheck-missing-m4.sh: Likewise.
    * t/tap-color.sh: Likewise.
    * t/color.test (test_no_color): Likewise.
    * t/color2.test (test_no_color): Likewise.
    Remove redundant check that parallel make does nor redirect
    output to temporary files or named pipes.
    * t/tap-color.sh: Likewise.
    * t/tap-doc.sh: Do not post-process make output to strip
    extra lines printed bu Sun dmake..
    * t/tap-doc2.sh: Remove stray comment.
    * t/yacc-mix-c-cxx.sh: Just assume that "make -jN" can
    run make in parallel mode.
    * t/tap-more.sh: Likewise.
    * t/dist-formats.tap: Likewise.
    * t/yacc-line.sh: Avoid workaround to cater for the
    Solaris XPG4 make inability to chain suffix rules.
    * t/lex-line.sh: Likewise.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 t/color.sh                  |   31 +-----------------------
 t/color2.sh                 |   54 +-----------------------------------------
 t/dist-formats.tap          |   24 +-----------------
 t/distcheck-missing-m4.sh   |    6 +---
 t/distcheck-outdated-m4.sh  |    6 +---
 t/lex-line.sh               |    6 ----
 t/posixsubst-ldadd.sh       |    1 -
 t/posixsubst-libraries.sh   |    1 -
 t/posixsubst-ltlibraries.sh |    1 -
 t/posixsubst-sources.sh     |    1 -
 t/posixsubst-tests.sh       |    1 -
 t/silent8.sh                |    5 +--
 t/tap-color.sh              |   32 +-----------------------
 t/tap-doc.sh                |    6 +----
 t/tap-doc2.sh               |    2 -
 t/tap-more.sh               |   11 +--------
 t/tap-signal.tap            |   12 +--------
 t/yacc-depend2.sh           |    3 +-
 t/yacc-line.sh              |    6 ----
 t/yacc-mix-c-cxx.sh         |   11 +--------
 20 files changed, 19 insertions(+), 201 deletions(-)

diff --git a/t/color.sh b/t/color.sh
index ed8fe33..edae625 100755
--- a/t/color.sh
+++ b/t/color.sh
@@ -98,35 +98,8 @@ test_color ()
 
 test_no_color ()
 {
-  # With make implementations that, like Solaris make, in case of errors
-  # print the whole failing recipe on standard output, we should content
-  # ourselves with a laxer check, to avoid false positives.
-  # Keep this in sync with lib/am/check.am:$(am__color_tests).
-  if $FGREP '= Xalways || test -t 1 ' stdout; then
-    # Extra verbose make, resort to laxer checks.
-    # Note that we also want to check that the testsuite summary is
-    # not unduly colorized.
-    (
-      set +e # In case some grepped regex below isn't matched.
-      # Not a useless use of cat; see above comments about grep.
-      cat stdout | grep "TOTAL.*:"
-      cat stdout | grep "PASS.*:"
-      cat stdout | grep "FAIL.*:"
-      cat stdout | grep "SKIP.*:"
-      cat stdout | grep "XFAIL.*:"
-      cat stdout | grep "XPASS.*:"
-      cat stdout | grep "ERROR.*:"
-      cat stdout | grep 'test.*expected'
-      cat stdout | grep 'test.*not run'
-      cat stdout | grep '===='
-      cat stdout | grep '[Ss]ee .*test-suite\.log'
-      cat stdout | grep '[Tt]estsuite summary'
-    ) | grep "$esc" && Exit 1
-    : For shells with broken 'set -e'
-  else
-    cat stdout | grep "$esc" && Exit 1
-    : For shells with broken 'set -e'
-  fi
+  cat stdout | grep "$esc" && Exit 1
+  :
 }
 
 for vpath in false :; do
diff --git a/t/color2.sh b/t/color2.sh
index b1c8830..4e8bb48 100755
--- a/t/color2.sh
+++ b/t/color2.sh
@@ -44,29 +44,6 @@ esac
 (set +e; expect -c 'exit ''77'; test $? -eq 77) \
   || skip_ "requires a working expect program"
 
-# Also, if the $MAKE program fails to consider the standard output as a
-# tty (this happens with e.g., BSD make and Solaris dmake when they're
-# run in parallel mode; see the autoconf manual), there is little point
-# in proceeding.
-cat > Makefile <<'END'
-all:
-## Creative quoting in the 'echo' below to avoid risk of spurious output
-## matches by 'expect', below.
-       @test -t 1 && echo "stdout" "is" "a" "tty"
-END
-
-cat > expect-check <<'END'
-eval spawn $env(MAKE)
-expect {
-  "stdout is a tty" { exit 0 }
-  default { exit 1 }
-}
-exit 1
-END
-MAKE=$MAKE expect -f expect-check \
-  || skip_ "make spawned by expect should have a tty stdout"
-rm -f expect-check Makefile
-
 # Do the tests.
 
 cat >>configure.ac <<END
@@ -128,35 +105,8 @@ test_color ()
 
 test_no_color ()
 {
-  # With make implementations that, like Solaris make, in case of errors
-  # print the whole failing recipe on standard output, we should content
-  # ourselves with a laxer check, to avoid false positives.
-  # Keep this in sync with lib/am/check.am:$(am__color_tests).
-  if $FGREP '= Xalways || test -t 1 ' stdout; then
-    # Extra verbose make, resort to laxer checks.
-    # Note that we also want to check that the testsuite summary is
-    # not unduly colorized.
-    (
-      set +e # In case some grepped regex below isn't matched.
-      # Not a useless use of cat; see above comments about grep.
-      cat stdout | grep "TOTAL.*:"
-      cat stdout | grep "PASS.*:"
-      cat stdout | grep "FAIL.*:"
-      cat stdout | grep "SKIP.*:"
-      cat stdout | grep "XFAIL.*:"
-      cat stdout | grep "XPASS.*:"
-      cat stdout | grep "ERROR.*:"
-      cat stdout | grep 'test.*expected'
-      cat stdout | grep 'test.*not run'
-      cat stdout | grep '===='
-      cat stdout | grep '[Ss]ee .*test-suite\.log'
-      cat stdout | grep '[Tt]estsuite summary'
-    ) | grep "$esc" && Exit 1
-    : For shells with broken 'set -e'
-  else
-    cat stdout | grep "$esc" && Exit 1
-    : For shells with broken 'set -e'
-  fi
+  cat stdout | grep "$esc" && Exit 1
+  :
 }
 
 cat >expect-make <<'END'
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index 8a287ff..4dd6c20 100755
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -40,16 +40,6 @@ mkdir setup \
   && rm -rf setup \
   || fatal_ "creating common aclocal.m4 file"
 
-# Some make implementations (e.g., HP-UX) don't grok '-j', some require
-# no space between '-j' and the number of jobs (e.g., older GNU make
-# versions), and some *do* require a space between '-j' and the number
-# of jobs (e.g., Solaris dmake).  We need a runtime test to see what
-# works.
-for MAKE_j4 in "$MAKE -j4" "$MAKE -j 4" false; do
-  echo all: | $MAKE_j4 -f - && break
-  : For shells with buggy 'set -e'.
-done
-
 # Set variables '$compressor' and '$suffix'.
 setup_vars_for_compression_format ()
 {
@@ -332,17 +322,13 @@ command_ok_ "$desc [automake]" $AUTOMAKE
 skip_reason=
 have_compressor compress || skip_reason="'compress' not available"
 have_compressor bzip2 || skip_reason="'bzip2' not available"
-if test "$MAKE_j4" = false; then
-  test -z "$skip_reason" || skip_reason="$skip_reason and "
-  skip_reason="${skip_reason}make concurrency unavailable"
-fi
 
 if test -n "$skip_reason"; then
   skip_row_ 6 -r "$skip_reason" "$desc"
 else
   command_ok_ "$desc [autoconf]" $AUTOCONF
   command_ok_ "$desc [configure]" ./configure
-  command_ok_ "$desc [make -j4 dist-all]"  $MAKE_j4 dist
+  command_ok_ "$desc [make -j4 dist-all]"  $MAKE -j4 dist
   ls -l # For debugging.
   command_ok_ "$desc [check .tar.gz tarball]"  check_tarball gzip
   command_ok_ "$desc [check .tar.bz2 tarball]" check_tarball bzip2
@@ -436,13 +422,7 @@ command_ok_ \
   "$desc ['make dist-all', stubbed]" \
   $MAKE dist-all
 
-subdesc="$desc ['make dist -j4', stubbed]"
-if test "$MAKE_j4" = false; then
-  skip_ -r "make concurrency unavailable" "$subdesc"
-else
-  command_ok_ "$subdesc" $MAKE_j4 dist
-fi
-unset subdesc
+command_ok_ "$desc ['make dist -j4', stubbed]" $MAKE -j4 dist
 
 PATH=$oPATH; export PATH
 
diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh
index 0e9007f..abccac8 100755
--- a/t/distcheck-missing-m4.sh
+++ b/t/distcheck-missing-m4.sh
@@ -66,10 +66,8 @@ $AUTOMAKE
 check_no_spurious_error ()
 {
   $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1
-  # On failure, some make implementations (such as Solaris make) print the
-  # whole failed recipe on stdout.  The first grep works around this.
-  grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && Exit 1
-  : To placate 'set -e'.
+  grep -i 'autom4te.*\.cache' output && Exit 1
+  : # To placate 'set -e'.
 }
 
 ./configure
diff --git a/t/distcheck-outdated-m4.sh b/t/distcheck-outdated-m4.sh
index 0fb624e..b523969 100755
--- a/t/distcheck-outdated-m4.sh
+++ b/t/distcheck-outdated-m4.sh
@@ -60,10 +60,8 @@ $MAKE distcheck # Sanity check.
 check_no_spurious_error ()
 {
   $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1
-  # On failure, some make implementations (such as Solaris make) print the
-  # whole failed recipe on stdout.  The first grep works around this.
-  grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && Exit 1
-  : To placate 'set -e'.
+  grep -i 'autom4te.*\.cache' output && Exit 1
+  : # To placate 'set -e'.
 }
 
 # We start to use a new "third-party" macro in a new version
diff --git a/t/lex-line.sh b/t/lex-line.sh
index 05b6f99..20bd9c8 100755
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -39,9 +39,6 @@ LDADD = $(LEXLIB)
 bar_LFLAGS = -v
 foo_SOURCES = zardoz.l
 bar_SOURCES = dir/quux.l
-## Avoid spurious failures with Solaris make.
address@hidden@: zardoz.c
address@hidden@: bar-quux.c
 END
 
 cat > sub/Makefile.am << 'END'
@@ -52,9 +49,6 @@ LDADD = @LEXLIB@
 foo_LFLAGS = -v
 foo_SOURCES = zardoz.l
 bar_SOURCES = dir/quux.l
-## Avoid spurious failures with Solaris make.
address@hidden@: foo-zardoz.c
-dir/address@hidden@: dir/quux.c
 END
 
 cat > zardoz.l << 'END'
diff --git a/t/posixsubst-ldadd.sh b/t/posixsubst-ldadd.sh
index f1cc55b..2f5b6d5 100755
--- a/t/posixsubst-ldadd.sh
+++ b/t/posixsubst-ldadd.sh
@@ -44,7 +44,6 @@ bar_LDADD = $(v:=.a) libquux2.a $(w:none=libquux3.a)
 
 libquux1.c:
        echo 'int quux1(void) { return 0; }' > $@
-CLEANFILES = libquux1.c # For FreeBSD make.
 END
 
 cat > foo.c <<'END'
diff --git a/t/posixsubst-libraries.sh b/t/posixsubst-libraries.sh
index 8e6b265..5f32d4f 100755
--- a/t/posixsubst-libraries.sh
+++ b/t/posixsubst-libraries.sh
@@ -38,7 +38,6 @@ lib_LIBRARIES = $(foolibs:=.a) $(barlibs:z=r.a)
 
 libbar.c:
        echo 'int bar(void) { return 0; }' > $@
-CLEANFILES = libbar.c # For FreeBSD make.
 
 installcheck-local:
        ls -l $(prefix)/lib
diff --git a/t/posixsubst-ltlibraries.sh b/t/posixsubst-ltlibraries.sh
index 6a4cbd5..e3a128f 100755
--- a/t/posixsubst-ltlibraries.sh
+++ b/t/posixsubst-ltlibraries.sh
@@ -38,7 +38,6 @@ lib_LTLIBRARIES = $(foolibs:=.la) $(barlibs:z=r.la)
 
 libbar.c:
        echo 'int bar(void) { return 0; }' > $@
-CLEANFILES = libbar.c # For FreeBSD make.
 
 installcheck-local:
        ls -l $(prefix)/lib
diff --git a/t/posixsubst-sources.sh b/t/posixsubst-sources.sh
index ccd61b9..17cd4f0 100755
--- a/t/posixsubst-sources.sh
+++ b/t/posixsubst-sources.sh
@@ -41,7 +41,6 @@ nodist_foo_SOURCES = $(BAZ:=c)
 bar.c baz.c:
        echo 'int $@ (void) { return 0; }' | sed 's/\.c //' > $@
 CLEANFILES = baz.c
-CLEANFILES += bar.c # For FreeBSD make.
 
 .PHONY: test test2
 check-local: test1 test2
diff --git a/t/posixsubst-tests.sh b/t/posixsubst-tests.sh
index 27a451d..37c23d3 100755
--- a/t/posixsubst-tests.sh
+++ b/t/posixsubst-tests.sh
@@ -30,7 +30,6 @@ t3 = bar2
 
 foo2.test barz:
        (echo '#!/bin/sh' && echo 'exit 0') > $@ && chmod a+x $@
-CLEANFILES = foo2.test barz # For FreeBSD make.
 
 # Also try an empty match suffix, to ensure that the ':=' in there is
 # not confused by the parser with an unportable assignment operator.
diff --git a/t/silent8.sh b/t/silent8.sh
index a2fdb44..b2059a8 100755
--- a/t/silent8.sh
+++ b/t/silent8.sh
@@ -48,8 +48,7 @@ $MAKE V=0 dvi html info ps pdf >stdout || { cat stdout; Exit 
1; }
 cat stdout
 grep 'DVIPS    foo.ps' stdout || Exit 1
 grep 'MAKEINFO foo.html' stdout || Exit 1
-# NetBSD make will print './foo.info' instead of 'foo.info'.
-grep 'MAKEINFO.*foo.info' stdout || Exit 1
+grep 'MAKEINFO foo.info' stdout || Exit 1
 grep 'TEXI2DVI foo.dvi' stdout || Exit 1
 grep 'TEXI2PDF foo.pdf' stdout || Exit 1
 
@@ -59,7 +58,7 @@ $MAKE V=1 dvi html info ps pdf >stdout || { cat stdout; Exit 
1; }
 cat stdout
 grep 'DVIPS    foo.ps' stdout && Exit 1
 grep 'MAKEINFO foo.html' stdout && Exit 1
-grep 'MAKEINFO.*foo.info' stdout && Exit 1
+grep 'MAKEINFO foo.info' stdout && Exit 1
 grep 'TEXI2DVI foo.dvi' stdout && Exit 1
 grep 'TEXI2PDF foo.pdf' stdout && Exit 1
 
diff --git a/t/tap-color.sh b/t/tap-color.sh
index c677c31..794f459 100755
--- a/t/tap-color.sh
+++ b/t/tap-color.sh
@@ -130,36 +130,8 @@ test_color ()
 
 test_no_color ()
 {
-  # With make implementations that, like Solaris make, in case of errors
-  # print the whole failing recipe on standard output, we should content
-  # ourselves with a laxer check, to avoid false positives.
-  # Keep this in sync with lib/am/check.am:$(am__color_tests).
-  if $FGREP '= Xalways || test -t 1 ' stdout; then
-    # Extra verbose make, resort to laxer checks.
-    # But we also want to check that the testsuite summary is not unduly
-    # colorized.
-    (
-      set +e # In case some grepped regex below isn't matched.
-      # Not a useless use of cat; see above comments about grep.
-      cat stdout | grep "TOTAL.*:"
-      cat stdout | grep "PASS.*:"
-      cat stdout | grep "FAIL.*:"
-      cat stdout | grep "SKIP.*:"
-      cat stdout | grep "XFAIL.*:"
-      cat stdout | grep "XPASS.*:"
-      cat stdout | grep "ERROR.*:"
-      cat stdout | grep "^#"
-      cat stdout | grep 'test.*expected'
-      cat stdout | grep 'test.*not run'
-      cat stdout | grep '===='
-      cat stdout | grep '[Ss]ee .*test-suite\.log'
-      cat stdout | grep '[Tt]estsuite summary'
-    ) | grep "$esc" && Exit 1
-    : For shells with broken 'set -e'
-  else
-    cat stdout | grep "$esc" && Exit 1
-    : For shells with broken 'set -e'
-  fi
+  cat stdout | grep "$esc" && Exit 1
+  :
 }
 
 # It should be possible to override AM_COLOR_TESTS also from the
diff --git a/t/tap-doc.sh b/t/tap-doc.sh
index 46b3b51..636c4cf 100755
--- a/t/tap-doc.sh
+++ b/t/tap-doc.sh
@@ -85,11 +85,7 @@ PASS: mu.tap 1
 XFAIL: mu.tap 2 # TODO frobnication not yet implemented
 END
 
-sed -n '/^PASS: foo\.sh/,/^XFAIL: mu\.tap/p' stdout > t
-cat t
-# Strip extra "informative" lines that could be printed by Solaris
-# Distributed Make.
-LC_ALL=C $EGREP -v ' --> ([0-9][0-9]* job|[Jj]ob output)' t > got
+sed -n '/^PASS: foo\.sh/,/^XFAIL: mu\.tap/p' stdout > got
 
 cat exp
 cat got
diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh
index 95fb546..2864b42 100755
--- a/t/tap-doc2.sh
+++ b/t/tap-doc2.sh
@@ -68,8 +68,6 @@ END
 
 chmod a+x *.test
 
-# Strip extra "informative" lines that could be printed by Solaris
-# Distributed Make.
 mkdir build-aux
 cp "$am_scriptdir"/tap-driver.sh build-aux \
   || framework_failure_ "fetching the perl TAP driver"
diff --git a/t/tap-more.sh b/t/tap-more.sh
index 6f5d5fe..00abbf2 100755
--- a/t/tap-more.sh
+++ b/t/tap-more.sh
@@ -97,16 +97,7 @@ for try in 0 1; do
         run_make=$MAKE
         ;;
       *)
-        # Some make implementations (e.g., HP-UX) don't grok '-j',
-        # some require no space between '-j' and the number of jobs
-        # (e.g., older GNU make versions), and some *do* require a
-        # space between '-j' and the number of jobs (e.g., Solaris
-        # dmake).  We need a runtime test to see what works.
-        echo 'all:' > Makefile
-        for run_make in "$MAKE -j3" "$MAKE -j 3" "$MAKE"; do
-          $run_make && break
-        done
-        rm -f Makefile
+        run_make="$MAKE -j3"
         ;;
     esac
   else
diff --git a/t/tap-signal.tap b/t/tap-signal.tap
index ab1cd40..ba17bd4 100755
--- a/t/tap-signal.tap
+++ b/t/tap-signal.tap
@@ -106,17 +106,7 @@ signal_caught ()
   esac
 }
 
-command_ok_ '"make check" fails' eval '
-  (
-    st=0; $MAKE check >stdout || st=$?
-    cat stdout
-    # Extra "echo" and silencing of xtraces required to avoid possible
-    # garbled output with NetBSD make, which would miss some final
-    # newlines in the expected places and thus mess up our TAP output.
-    set +x; echo
-    test $st -gt 0
-  )
-'
+command_ok_ '"make check" fails' eval 'not $MAKE check >stdout'
 cat stdout # For debugging.
 
 command_ok_ "count of test results" count_test_results \
diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh
index 879cc59..7b5cd1c 100755
--- a/t/yacc-depend2.sh
+++ b/t/yacc-depend2.sh
@@ -15,8 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make sure depcomp does not needlessly update headers and objects
-# for yacc rules.  This test still fails with FreeBSD make (but passes
-# with NetBSD make).
+# for yacc rules.
 
 required=yacc
 . ./defs || Exit 1
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
index ac6a0aa..86a490d 100755
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@ -39,9 +39,6 @@ AM_YFLAGS = -d
 bar_YFLAGS =
 foo_SOURCES = zardoz.y
 bar_SOURCES = dir/quux.y
-## Avoid spurious failures with Solaris make.
address@hidden@: zardoz.c
address@hidden@: bar-quux.c
 END
 
 cat > sub/Makefile.am << 'END'
@@ -50,9 +47,6 @@ noinst_PROGRAMS = foo bar
 foo_YFLAGS = -d
 foo_SOURCES = zardoz.y
 bar_SOURCES = dir/quux.y
-## Avoid spurious failures with Solaris make.
address@hidden@: foo-zardoz.c
-dir/address@hidden@: dir/quux.c
 END
 
 cat > zardoz.y << 'END'
diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh
index 8f72b35..affd938 100755
--- a/t/yacc-mix-c-cxx.sh
+++ b/t/yacc-mix-c-cxx.sh
@@ -153,16 +153,7 @@ for try in 0 1; do
         # not override it.
         run_make=$MAKE;;
       *)
-        # Some make implementations (e.g., HP-UX) don't grok '-j',
-        # some require no space between '-j' and the number of jobs
-        # (e.g., older GNU make versions), and some *do* require a
-        # space between '-j' and the number of jobs (e.g., Solaris
-        # dmake).  We need a runtime test to see what works.
-        echo 'all:' > Makefile
-        for run_make in "$MAKE -j3" "$MAKE -j 3" "$MAKE"; do
-          $run_make && break
-        done
-        rm -f Makefile
+        run_make="$MAKE -j3";;
     esac
   else
     echo "$me: invalid value of \$try '$try'" >&2


hooks/post-receive
-- 
GNU Automake