[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. ng-0.5a-33-gbfdfdaa

[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=bfdfdaa87da4f0549b13538aca50464904b160c4

The branch, ng/master has been updated
       via  bfdfdaa87da4f0549b13538aca50464904b160c4 (commit)
       via  96f4c9c58d1b3f43109d178b68c52c0c2576310d (commit)
      from  01797e0cf1e633d76e4cdf6015f185164590898d (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 bfdfdaa87da4f0549b13538aca50464904b160c4
Author: Stefano Lattarini <address@hidden>
Date:   Tue Feb 21 16:22:45 2012 +0100

    [ng] tests: "make -k" can be trusted with GNU make
    
    * tests/check12.test: Trust exit status of "make -k".
    * tests/check4.test: Likewise.
    * tests/gnits2.test: Likewise.
    * tests/gnits3.test: Likewise.
    * tests/make-dryrun.tap: Likewise.
    * tests/distlinksbrk.test: Trust that "make -k" really doesn't exit
    at the first error, and prints error messages to stderr.  Related
    simplifications and reorganization.

commit 96f4c9c58d1b3f43109d178b68c52c0c2576310d
Author: Stefano Lattarini <address@hidden>
Date:   Tue Feb 21 16:09:45 2012 +0100

    [ng] cleanup: after recent merge of 'master' branch
    
    * .gitignore: Fix name of automake and aclocal wrappers used in the
    testsuite, to account for the recent version downgrade (to 0.5a) of
    Automake-NG.
    * tests/make-dryrun.tap, tests/parallel-tests-empty-testlogs.test,
    tests/parallel-tests-extra-programs.test, tests/lex-noyywrap.test,
    tests/lex-libobj.test, tests/parallel-tests3.test, tests/man8.test,
    tests/man6.test, tests/lex-lib-external.test: Remove useless
    workarounds or probing for non-GNU make.
    * tests/make-dryrun.tap: Don't pass 'AM_MAKEFLAGS' definition to
    make invocations.

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

Summary of changes:
 .gitignore                               |    4 +-
 tests/check12.test                       |    4 +-
 tests/check4.test                        |    8 ++----
 tests/distlinksbrk.test                  |   27 ++++++++++++++----------
 tests/gnits2.test                        |    2 +-
 tests/gnits3.test                        |    2 +-
 tests/lex-lib-external.test              |    2 +-
 tests/lex-libobj.test                    |    2 +-
 tests/lex-noyywrap.test                  |    2 +-
 tests/make-dryrun.tap                    |   33 ++++++++---------------------
 tests/man6.test                          |    4 ---
 tests/man8.test                          |    4 ---
 tests/parallel-tests-empty-testlogs.test |   11 +---------
 tests/parallel-tests-extra-programs.test |   14 ++----------
 tests/parallel-tests3.test               |   25 +--------------------
 15 files changed, 43 insertions(+), 101 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6ee3708..7bba195 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,8 +47,8 @@ Makefile
 /doc/amhello/install-sh
 /doc/amhello/missing
 /lib/Automake/Config.pm
-/tests/wrap/aclocal-1.*
-/tests/wrap/automake-1.*
+/tests/wrap/aclocal-*
+/tests/wrap/automake-*
 /tests/defs-static
 /tests/testsuite-part.am
 /tests/*-w.tap
diff --git a/tests/check12.test b/tests/check12.test
index 1afa959..c4440ea 100755
--- a/tests/check12.test
+++ b/tests/check12.test
@@ -183,8 +183,8 @@ for vpath in : false; do
   CHECKLOCAL_EXIT_STATUS=1 $MAKE check && Exit 1
   grep 'check-local failed :-(' local.log
 
-  # Do not trust the exit status of `make -k'.
-  NAIL=screw B_EXIT_STATUS=23 CHECKLOCAL_EXIT_STATUS=1 $MAKE -k check || :
+  env NAIL=screw B_EXIT_STATUS=23 CHECKLOCAL_EXIT_STATUS=1 \
+      $MAKE -k check && Exit 1
   test -f hammer.log
   test -f hammer.sum
   test -f spanner.log
diff --git a/tests/check4.test b/tests/check4.test
index 7edfa5a..f4dc592 100755
--- a/tests/check4.test
+++ b/tests/check4.test
@@ -55,15 +55,13 @@ cat stdout
 grep '^FAIL: fail\.sh *$' stdout
 grep '^PASS: ok\.sh *$' stdout && Exit 1
 
-# The exit status of `make -k' can be anything
-# (depending on the Make implementation)
-$MAKE -k check >stdout || :
+$MAKE -k check >stdout && { cat stdout; Exit 1; }
 cat stdout
 grep '^FAIL: fail\.sh *$' stdout
 grep '^PASS: ok\.sh *$' stdout
 
 # Should also works when -k is not in first position.
-$MAKE -s -k check >stdout || :
+$MAKE -s -k check >stdout && { cat stdout; Exit 1; }
 cat stdout
 grep '^FAIL: fail\.sh *' stdout
 grep '^PASS: ok\.sh *' stdout
@@ -71,7 +69,7 @@ grep '^PASS: ok\.sh *' stdout
 # Try with a long-option that do not have a short option equivalent
 # (here, --no-print-directory).  That should cause all options to
 # appear verbatim in MAKEFLAGS.
-$MAKE --no-print-directory -k check >stdout || :
+$MAKE --no-print-directory -k check >stdout && { cat stdout; Exit 1; }
 cat stdout
 grep '^FAIL: fail\.sh *$' stdout
 grep '^PASS: ok\.sh *$' stdout
diff --git a/tests/distlinksbrk.test b/tests/distlinksbrk.test
index 8dcd81e..7d1926b 100755
--- a/tests/distlinksbrk.test
+++ b/tests/distlinksbrk.test
@@ -48,21 +48,26 @@ cat >> configure.in <<'END'
 AC_OUTPUT
 END
 
+cat > Makefile.am <<END
+EXTRA_DIST = $lnk1 $lnk2 $lnka $lnkb
+END
+
 $ACLOCAL
 $AUTOCONF
+$AUTOMAKE
+./configure
 
 ls -l # For debugging.
 
-# Don't try to use "make -k", because some botched make implementations
-# (HP-UX, IRIX) might still exit on the first error in this situations.
-for lnk in $lnk1 $lnk2 $lnka $lnkb; do
-  echo "EXTRA_DIST = $lnk" > Makefile.am
-  $AUTOMAKE
-  ./configure
-  # Distribution must fail, with a decent error message.
-  $MAKE distdir >out 2>&1 && { cat out; Exit 1; }
-  cat out
-  $FGREP $lnk out
-done
+# Distribution must fail.
+$MAKE distdir && Exit 1
+
+# Names of distributed broken symlinks should be reported in make output.
+$MAKE -k distdir 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+$FGREP $lnk1 stderr
+$FGREP $lnk2 stderr
+$FGREP $lnka stderr
+$FGREP $lnkb stderr
 
 :
diff --git a/tests/gnits2.test b/tests/gnits2.test
index d65586f..97028f2 100755
--- a/tests/gnits2.test
+++ b/tests/gnits2.test
@@ -107,7 +107,7 @@ cd build
 ../configure "--prefix=`pwd`/../inst-dir" --program-prefix=p
 $MAKE all
 $MAKE test-install
-$MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
+$MAKE -k installcheck 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 $MAKE grep-stderr
 
diff --git a/tests/gnits3.test b/tests/gnits3.test
index 17ab6f0..35c2b0c 100755
--- a/tests/gnits3.test
+++ b/tests/gnits3.test
@@ -87,7 +87,7 @@ cd build
 $MAKE
 $MAKE install
 $MAKE installcheck && Exit 1
-$MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
+$MAKE -k installcheck 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 $MAKE grep-stderr
 
diff --git a/tests/lex-lib-external.test b/tests/lex-lib-external.test
index 47bee77..d50ae39 100755
--- a/tests/lex-lib-external.test
+++ b/tests/lex-lib-external.test
@@ -71,6 +71,6 @@ if cross_compiling; then :; else
   echo BAD | ./lexer && Exit 1
   : For shells with busted 'set -e'.
 fi
-yl_distcheck
+$MAKE distcheck
 
 :
diff --git a/tests/lex-libobj.test b/tests/lex-libobj.test
index 3837a0b..3bd4f8a 100755
--- a/tests/lex-libobj.test
+++ b/tests/lex-libobj.test
@@ -70,6 +70,6 @@ grep LIBOBJS Makefile # For debugging.
 grep '^LIBOBJS *=.*yywrap.*\.o' Makefile # Sanity check.
 $MAKE
 
-yl_distcheck
+$MAKE distcheck
 
 :
diff --git a/tests/lex-noyywrap.test b/tests/lex-noyywrap.test
index a0eb731..5b002c8 100755
--- a/tests/lex-noyywrap.test
+++ b/tests/lex-noyywrap.test
@@ -67,6 +67,6 @@ if cross_compiling; then :; else
 fi
 
 # Sanity check on distribution.
-yl_distcheck DISTCHECK_CONFIGURE_FLAGS='LEXLIB="none needed"'
+$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS='LEXLIB="none needed"'
 
 :
diff --git a/tests/make-dryrun.tap b/tests/make-dryrun.tap
index e54ae01..a581bc4 100755
--- a/tests/make-dryrun.tap
+++ b/tests/make-dryrun.tap
@@ -21,12 +21,6 @@ am_parallel_tests=yes # Avoid generation of a useless 
wrapper test.
 
 plan_ 14
 
-if echo "all: ; @+printf %sbb%s aa cc" | $MAKE -n -f - | grep aabbcc; then
-  make_plus_silence () { return 0; }
-else
-  make_plus_silence () { return 1; }
-fi
-
 mkdir sub
 
 echo AC_OUTPUT >> configure.in
@@ -64,8 +58,8 @@ check_no_dryrun
 # make running in normal mode was sometimes mistaken for make running
 # in dry mode.
 check_no_dryrun TESTS="n1.test n2.test"
-check_no_dryrun TESTS="n1 n2" AM_MAKEFLAGS="TESTS='n1 n2'"
-check_no_dryrun TESTS="n1 n2" AM_MAKEFLAGS='TESTS="n1 n2"'
+check_no_dryrun TESTS="n1 n2"
+check_no_dryrun TESTS="n1 n2"
 check_no_dryrun FOOFLAGS="-n -n -knf2 n --none -n"
 check_no_dryrun MYFLAGS="-n --dryrun -n --dry-run -n"
 
@@ -73,26 +67,17 @@ check_no_dryrun MYFLAGS="-n --dryrun -n --dry-run -n"
 
 check_dryrun ()
 {
-  r=ok directive=
-  case $1 in
-    -C) condition=$2 reason=$3; shift; shift; shift;;
-     *) condition=: reason=;;
-  esac
-  if $condition; then
-    $MAKE dry ${1+"$@"}   || r='not ok'
-    test -f from-dry-mode || r='not ok'
-    rm -f from-dry-mode   || fatal_ "cleaning up"
-  else
-    directive=SKIP
-  fi
-  result_ "$r" -D "$directive" -r "$reason" "not dry-run ($cnt)"
-  unset r directive reason
+  r=ok
+  $MAKE dry ${1+"$@"}   || r='not ok'
+  test -f from-dry-mode || r='not ok'
+  rm -f from-dry-mode   || fatal_ "cleaning up"
+  result_ "$r" "not dry-run ($cnt)"
   cnt=`expr $cnt + 1`
 }
 cnt=1
 
-check_dryrun -C make_plus_silence 'recipe prefix "+" unsupported' -n
-check_dryrun -C using_gmake "\$MAKE is not GNU make" --dry-run -k
+check_dryrun -n
+check_dryrun --dry-run -k
 
 # ----------------------------------------------------------------------
 
diff --git a/tests/man6.test b/tests/man6.test
index daf0842..aa49049 100755
--- a/tests/man6.test
+++ b/tests/man6.test
@@ -20,10 +20,6 @@
 required=help2man
 . ./defs || Exit 1
 
-# Avoid a spurious failure due to a known FreeBSD make incompatibility.
-useless_vpath_rebuild \
-  && skip_ "VPATH useless rebuild detected (see bug#7884)"
-
 cat > Makefile.am << 'END'
 dist_man_MANS = $(srcdir)/foobar.1 bazquux.1 zardoz.1
 dist_bin_SCRIPTS = foobar bazquux zardoz
diff --git a/tests/man8.test b/tests/man8.test
index bdc0feb..e03341b 100755
--- a/tests/man8.test
+++ b/tests/man8.test
@@ -18,10 +18,6 @@
 
 . ./defs || Exit 1
 
-# Avoid a spurious failure due to a known FreeBSD make incompatibility.
-useless_vpath_rebuild \
-  && skip_ "VPATH useless rebuild detected (see bug#7884)"
-
 cat > Makefile.am << 'END'
 dist_man_MANS = foo.1
 foo.1:
diff --git a/tests/parallel-tests-empty-testlogs.test 
b/tests/parallel-tests-empty-testlogs.test
index 4e22e21..9e27041 100755
--- a/tests/parallel-tests-empty-testlogs.test
+++ b/tests/parallel-tests-empty-testlogs.test
@@ -34,18 +34,9 @@ mkdir sub1 sub2
 
 cat > sub1/Makefile.am << 'END'
 TESTS =
-END
-
-# When $(TESTS) is empty, NetBSD 5.1 make ends up defining $(TESTS_LOGS)
-# to ".log" rather than to the empty string (as would be expected).
-# But our recipes are smart enough to work around such a botched-up
-# substitution, so let's not bother too much about it.
-if using_gmake; then
-  unindent >> sub1/Makefile.am << 'END'
-    check-local:
+check-local:
        echo $(TEST_LOGS) | grep . && exit 1; exit 0
 END
-fi
 
 cat > sub2/Makefile.am << 'END'
 TESTS = foo.test
diff --git a/tests/parallel-tests-extra-programs.test 
b/tests/parallel-tests-extra-programs.test
index 15857f8..94f4aef 100755
--- a/tests/parallel-tests-extra-programs.test
+++ b/tests/parallel-tests-extra-programs.test
@@ -121,13 +121,7 @@ $MAKE -k check >stdout 2>stderr || st=$?
 cat stdout
 cat stderr >&2
 ls -l
-if using_gmake; then
-  test $st -gt 0 || Exit 1
-else
-  # Don't trust exit status of "make -k" for non-GNU make.
-  $MAKE check && Exit 1
-  : For shells with busted 'set -e'.
-fi
+test $st -gt 0
 
 # Files that should have been created, with the expected content.
 cat bar.c
@@ -143,10 +137,8 @@ grep '^PASS: baz\.test$' stdout
 # $(EXEEXT).
 grep '^PASS: foo\.bin' stdout
 grep '^PASS: bar\.bin' stdout
-# Expected error messages from make.  Some make implementations (e.g.,
-# FreeBSD make) seem to print the error on stdout instead, so check for
-# it there as well.
-$EGREP 'none\.(bin|o|c)' stderr stdout
+# Expected error messages from make.
+$EGREP 'none\.(bin|o|c)' stderr
 
 # What we check now:
 #  1. if we make the last EXTRA_PROGRAM buildable, the failed tests
diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
index b37cf0a..ffa900e 100755
--- a/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@ -24,27 +24,6 @@ case $MAKE in
   *\ -j*) skip_ "\$MAKE contains \`-j'";;
 esac
 
-if using_gmake; then
-  j=-j
-else
-  unindent > Makefile <<END
-    all: one two
-    one:
-       $sleep && test -f two
-    two:
-       echo ok > \$@
-END
-  for j in "-j" "-j " NONE; do
-    if test x"$j" = xNONE; then
-      skip_ "can't run make in parallel mode"
-    fi
-    $MAKE ${j}2 all >output 2>&1 || continue
-    $EGREP -i "(warning|error):|-j[\"\'\` ]" output && continue
-    break
-  done
-  rm -f one output Makefile
-fi
-
 cat >> configure.in << 'END'
 AC_OUTPUT
 END
@@ -87,13 +66,13 @@ for build in serial parallel; do
 done
 
 cd serial
-$MAKE ${j}1 check &
+$MAKE -j1 check &
 cd ../parallel
 $sleep
 # Use append mode here to avoid dropping output.
 # Yes, this actually happens.
 : >stdout
-$MAKE ${j}4 check >> stdout
+$MAKE -j4 check >> stdout
 cd ..
 # Ensure the tests are really being run in parallel mode: if this is
 # the case, the serial run of the dummy testsuite started above should


hooks/post-receive
-- 
GNU Automake