From: Stefano Lattarini Date: Thu, 28 Jun 2012 11:27:49 +0000 (+0200) Subject: Merge branch 'maint' X-Git-Tag: v1.12b~103 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b21d68690612214d8edd810acf11880c3c0ad586;p=platform%2Fupstream%2Fautomake.git Merge branch 'maint' * maint: tests: simpler workaround for shells losing the exit status in exit trap + Extra non-trivial edits: * Several tests: Adjusted to use 'exit' rather than 'Exit'. Signed-off-by: Stefano Lattarini --- b21d68690612214d8edd810acf11880c3c0ad586 diff --cc t/aclocal-acdir.sh index e5b2bd2,abd7857..ac5de4c --- a/t/aclocal-acdir.sh +++ b/t/aclocal-acdir.sh @@@ -14,11 -14,11 +14,11 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Test aclocal's '--acdir', '--automake-acdir' and '--system-acdir' -# options. Also check that stuff in the automake acdir takes precedence -# over stuff in the system acdir. +# Test aclocal's '--automake-acdir' and '--system-acdir' options. Also +# check that stuff in the automake acdir takes precedence over stuff in +# the system acdir. - . ./defs || Exit 1 + . ./defs || exit 1 mkdir am sys @@@ -70,6 -70,26 +70,6 @@@ $ACLOCAL --automake-acdir am --system-a $AUTOCONF --force $FGREP 'fake--init--automake' configure $FGREP 'am--macro' configure - $FGREP 'my--macro' configure && Exit 1 # Just to be sure. + $FGREP 'my--macro' configure && exit 1 # Just to be sure. -rm -rf autom4te*.cache - -# Obsolescent '--acdir' option. -$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep '.*--acdir.*deprecated' stderr - -rm -rf autom4te*.cache - -$ACLOCAL -Wno-obsolete --acdir am -$AUTOCONF --force -$FGREP 'fake--init--automake' configure -$FGREP 'am--macro' configure - -rm -rf autom4te*.cache - -$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr - : diff --cc t/acsilent.sh index 7d13fa0,18f18ff..92c4300 --- a/t/acsilent.sh +++ b/t/acsilent.sh @@@ -16,10 -16,10 +16,10 @@@ # Test to make sure there are no spurious acinclude warnings. - . ./defs || Exit 1 + . ./defs || exit 1 cat >configure.ac <. -# Check that automake warns against old-style usages of AM_INIT_AUTOMAKE -# (i.e., calls with two or three arguments). +# Check that automake error out (with an helpful error message) against +# old-style usages of AM_INIT_AUTOMAKE (i.e., calls with two or three +# arguments). - . ./defs || Exit 1 + . ./defs || exit 1 -warn_rx='AM_INIT_AUTOMAKE.* two-.* three-arguments form.*deprecated' +warn_rx='AM_INIT_AUTOMAKE.* old-style two-.* three-arguments form.*unsupported' + +$ACLOCAL +mv aclocal.m4 aclocal.sav cat > configure.ac <<'END' AC_INIT([Makefile.am]) @@@ -34,11 -30,13 +34,11 @@@ EN do_check() { rm -rf autom4te*.cache - for cmd in "$AUTOCONF" "$AUTOMAKE"; do - $cmd -Werror -Wnone -Wobsolete 2>stderr && { cat stderr; exit 1; } + for cmd in "$ACLOCAL" "$AUTOCONF" "$AUTOMAKE"; do + cp aclocal.sav aclocal.m4 - $cmd -Wnone -Wno-error 2>stderr && { cat stderr; Exit 1; } ++ $cmd -Wnone -Wno-error 2>stderr && { cat stderr; exit 1; } cat stderr >&2 grep "^configure\.ac:2:.*$warn_rx" stderr - $cmd -Werror -Wall -Wno-obsolete || exit 1 done } diff --cc t/check-no-test-driver.sh index f86b4da,7df5251..bcb2cc9 --- a/t/check-no-test-driver.sh +++ b/t/check-no-test-driver.sh @@@ -15,15 -15,13 +15,15 @@@ # along with this program. If not, see . # Check that auxiliary script 'test-driver' doesn't get needlessly -# installed or referenced when the 'parallel-tests' option is not -# used. +# installed or referenced when the 'serial-tests' option is used. am_serial_tests=yes - . ./defs || Exit 1 + . ./defs || exit 1 -echo 'TESTS = foo.test' > Makefile.am +cat > Makefile.am <<'END' +AUTOMAKE_OPTIONS = serial-tests +TESTS = foo.test +END $ACLOCAL diff --cc t/check-tests-in-builddir.sh index 5b3cb22,de453d2..6785877 --- a/t/check-tests-in-builddir.sh +++ b/t/check-tests-in-builddir.sh @@@ -52,10 -52,10 +52,10 @@@ exit END chmod a+x bar.test - $MAKE check >out 2>&1 || { cat out; Exit1; } + $MAKE check >out 2>&1 || { cat out; exit 1; } cat out -# The simple-tests driver does not strip VPATH components from -# the name of the test, but the parallel-tests driver should. +# The serial test driver does not strip VPATH components from +# the name of the test, but the parallel driver should. if test x"$am_serial_tests" = x"yes"; then grep '^PASS: .*foo\.test *$' out else @@@ -66,10 -66,10 +66,10 @@@ grep '^PASS: bar\.test *$' ou rm -f test-suite.log foo.log bar.log - FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; Exit1; } + FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; exit 1; } cat out -# The simple-tests driver does not strip VPATH components from -# the name of the test, but the parallel-tests driver should. +# The serial test driver does not strip VPATH components from +# the name of the test, but the parallel driver should. if test x"$am_serial_tests" = x"yes"; then grep '^FAIL: .*foo\.test *$' out else diff --cc t/check8.sh index 4db8e86,b968c3a..6fcd30a --- a/t/check8.sh +++ b/t/check8.sh @@@ -75,10 -75,10 +75,10 @@@ grep '^[^X]*PASS.* bar' stdou grep '^[^X]*PASS.* sub/bar' stdout grep '^[^X]*FAIL.* baz' stdout grep 'XFAIL.* sub/baz' stdout -# 'parallel-tests' should not add circular dependencies. +# The parallel test driver should cause circular dependencies. # Look for known warnings from a couple of 'make' implementations. - grep -i 'circular.*dependency' stderr && Exit 1 - grep -i 'graph cycles' stderr && Exit 1 + grep -i 'circular.*dependency' stderr && exit 1 + grep -i 'graph cycles' stderr && exit 1 $MAKE distclean diff --cc t/confh-subdir-clean.sh index 26f3957,5a942da..75024f6 --- a/t/confh-subdir-clean.sh +++ b/t/confh-subdir-clean.sh @@@ -16,10 -16,10 +16,10 @@@ # Test to make sure config headers in subdirectories are cleaned. - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([sub/config.h:sub/config.hin]) +AC_CONFIG_HEADERS([sub/config.h:sub/config.hin]) AC_OUTPUT END diff --cc t/confh.sh index 9dc2f15,c86b63e..1407757 --- a/t/confh.sh +++ b/t/confh.sh @@@ -17,10 -17,10 +17,10 @@@ # Test to make sure config.h works in a subdir. # Report from Alexandre Oliva. - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([include/config.h]) +AC_CONFIG_HEADERS([include/config.h]) AC_OUTPUT END diff --cc t/confh6.sh index c94c7ba,5479491..fa6aab4 --- a/t/confh6.sh +++ b/t/confh6.sh @@@ -18,10 -18,10 +18,10 @@@ # idea is that if config.h is in a subdir, and there is no Makefile in # that subdir, then we want to build config.h as the top level. - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([subdir/config.h]) +AC_CONFIG_HEADERS([subdir/config.h]) AC_OUTPUT END diff --cc t/confh7.sh index 0bc2465,d771b3d..ec0edbe --- a/t/confh7.sh +++ b/t/confh7.sh @@@ -17,10 -17,10 +17,10 @@@ # Test to make sure several config headers are allowed. # See also sister "semantic" test 'confh8.test'. - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([config.h two.h]) +AC_CONFIG_HEADERS([config.h two.h]) END : > Makefile.am diff --cc t/confh8.sh index 2feaae5,45fbe8e..7379a34 --- a/t/confh8.sh +++ b/t/confh8.sh @@@ -17,10 -17,10 +17,10 @@@ # Test to make sure several config headers are allowed. # See also sister "minimalistic" test 'confh7.test'. - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([one.h two.h]) +AC_CONFIG_HEADERS([one.h two.h]) AC_OUTPUT END diff --cc t/cygnus-no-more.sh index 4be0561,551d0e6..66ef57d --- a/t/cygnus-no-more.sh +++ b/t/cygnus-no-more.sh @@@ -18,15 -18,30 +18,15 @@@ # That feature will be removed in the next major Automake release. # See automake bug#11034. - . ./defs || Exit 1 + . ./defs || exit 1 -warn_rx='support for Cygnus.*trees.*deprecated' - -cat >> configure.ac <<'END' -AC_PROG_CC -AM_MAINTAINER_MODE -END +warn_rx='support for Cygnus.*trees.*removed' $ACLOCAL -$AUTOCONF - -: > Makefile.am -# 'cygnus' option from command line -$AUTOMAKE --cygnus -Wno-obsolete -AUTOMAKE_fails --cygnus -grep "^automake.*: .*$warn_rx" stderr -AUTOMAKE_fails -Wnone -Wobsolete --cygnus -grep "^automake.*: .*$warn_rx" stderr -AUTOMAKE_fails --cygnus -Wnone -Wobsolete -grep "^automake.*: .*$warn_rx" stderr - -rm -rf autom4te*.cache +# Use of 'cygnus' option must raise an unconditional error, not a +# warning. +AUTOMAKE="$am_original_AUTOMAKE -Wnone -Wno-error" # 'cygnus' option in Makefile.am echo "AUTOMAKE_OPTIONS = cygnus" > Makefile.am diff --cc t/dirlist.sh index 98cd710,e188777..319726c --- a/t/dirlist.sh +++ b/t/dirlist.sh @@@ -16,10 -16,10 +16,10 @@@ # Check dirlist support. - . ./defs || Exit 1 + . ./defs || exit 1 cat > configure.ac < configure.ac <> configure.ac << 'END' AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in], diff --cc t/help-silent.sh index dbf45a0,b7e805e..601666c --- a/t/help-silent.sh +++ b/t/help-silent.sh @@@ -14,20 -14,23 +14,20 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Make sure that our macro 'AM_SILENT_RULES' adds proper text to -# the configure help screen. +# Make sure configure options relative to automake silent rules are +# added to the configure help screen. - . ./defs || Exit 1 + . ./defs || exit 1 -cat > configure.ac < Makefile.am $ACLOCAL -mv -f configure.ac configure.tmpl +cp configure.ac configure.tmpl -for args in '' '([])' '([yes])' '([no])'; do - sed "s/AM_SILENT_RULES.*/&$args/" configure.tmpl >configure.ac - cat configure.ac +for args in '' 'yes' 'no'; do + cp -f configure.tmpl configure.ac + test x"$args" = x || echo "AM_SILENT_RULES([$args])/" >> configure.ac + cat configure.ac # For debugging. $AUTOCONF --force grep_configure_help --enable-silent-rules \ ' less verbose build.*\(undo.*"make V=1".*\)' diff --cc t/instdir-texi.sh index dc74285,1d8015c..b15ecaa --- a/t/instdir-texi.sh +++ b/t/instdir-texi.sh @@@ -17,8 -17,8 +17,8 @@@ # If $(infodir) is the empty string, then nothing should be installed there. # Likewise for the other install-* targets used for texinfo files. -required='makeinfo-html tex texi2dvi' +required='makeinfo tex texi2dvi' - . ./defs || Exit 1 + . ./defs || exit 1 dvips --help \ || skip_ "dvips is missing" diff --cc t/java-compile-run-nested.sh index f5b7b95,fccc741..f6bb217 --- a/t/java-compile-run-nested.sh +++ b/t/java-compile-run-nested.sh @@@ -18,14 -18,14 +18,14 @@@ # Also meddle with wrapper scripts, as would be probably seen in a real # "UNIX-style" use case. # This test uses a typical "nested" source tree setup (i.e., different -# components/aspects are separated into different subdirectories), -# and uses the 'parallel-tests' testsuite driver. The sister test -# 'java-compile-run-flat.test' do similar checks with a "flat" setup -# (i.e., everything in the top-level directory), and forcing the use -# of the older non-parallel 'simple-tests' driver. +# components/aspects are separated into different subdirectories), and +# uses the parallel testsuite driver. +# The sister test 'java-compile-run-flat.test' do similar checks with a +# "flat" setup (i.e., everything in the top-level directory), and forcing +# the use of the older 'serial-tests' driver. required='java javac' - . ./defs || Exit 1 + . ./defs || exit 1 echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.ac diff --cc t/missing-version-mismatch.sh index 4a2910a,7b9c231..e4a1033 --- a/t/missing-version-mismatch.sh +++ b/t/missing-version-mismatch.sh @@@ -16,35 -16,43 +16,35 @@@ # Test missing with version mismatches. +am_create_testdir=empty - . ./defs || Exit 1 + . ./defs || exit 1 -cat >>configure.ac <<'EOF' -m4_include([v.m4]) -AC_OUTPUT -EOF +get_shell_script missing -: > v.m4 +do_check () +{ + progname=$1; shift; - ./missing "$@" 2>stderr && { cat stderr >&2; Exit 1; } ++ ./missing "$@" 2>stderr && { cat stderr >&2; exit 1; } + cat stderr >&2 + $FGREP "WARNING: '$progname' is probably too old." stderr +} -: > Makefile.am +echo 'AC_INIT([x], [1.0]) AC_PREREQ([9999])' >> configure.ac -get_shell_script missing +do_check autoconf $AUTOCONF +do_check autoheader $AUTOHEADER +do_check aclocal-$APIVERSION $am_original_ACLOCAL + +cat > configure.ac << 'END' +AC_INIT([x], [0]) +AM_INIT_AUTOMAKE +AC_CONFIG_FILES([Makefile]) +END +echo AUTOMAKE_OPTIONS = 9999.9999 > Makefile.am $ACLOCAL -$AUTOCONF -$AUTOMAKE --add-missing - -# See missing.test for explanations about this. -MYAUTOCONF="./missing --run $AUTOCONF" -unset AUTOCONF - -./configure AUTOCONF="$MYAUTOCONF" - -$MAKE -$sleep -# Hopefully the install version of Autoconf cannot compete with this one... -echo 'AC_PREREQ(9999)' > v.m4 -$MAKE distdir - -# Run again, but without missing, to ensure that timestamps were updated. -export AUTOMAKE ACLOCAL -./configure AUTOCONF="$MYAUTOCONF" -$MAKE - -# Make sure $MAKE fail when timestamps aren't updated and missing is not used. -$sleep -touch v.m4 -$MAKE && exit 1 +: > install-sh +# FIXME: this doesn't work due to a bug in automake (not 'missing'). +#do_check automake-$APIVERSION $am_original_AUTOMAKE : diff --cc t/missing3.sh index e8641da,c5db4f0..3a9ba01 --- a/t/missing3.sh +++ b/t/missing3.sh @@@ -23,26 -23,31 +23,26 @@@ get_shell_script missin # b7cb8259 assumed not to exist. -./missing b7cb8259 --version 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep . stderr && exit 1 -./missing b7cb8259 --grep 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep WARNING stderr - -./missing --run b7cb8259 --version && exit 1 -./missing --run b7cb8259 --grep 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep WARNING stderr +run_cmd () +{ + st=0; "$@" >stdout 2>stderr || st=$? + cat stdout + cat stderr >&2 + return $st +} + - ./missing b7cb8259 --version && Exit 1 - grep WARNING stderr && Exit 1 - run_cmd ./missing b7cb8259 --grep && Exit 1 ++./missing b7cb8259 --version && exit 1 ++grep WARNING stderr && exit 1 ++run_cmd ./missing b7cb8259 --grep && exit 1 +grep 'WARNING:.*missing on your system' stderr # missing itself it known to exist :) - run_cmd ./missing ./missing --version || Exit 1 -./missing ./missing --version 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep . stderr && exit 1 -./missing ./missing --grep 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 -grep WARNING stderr - -./missing --run ./missing --version 2>stderr || { cat stderr >&2; exit 1; } -cat stderr >&2 -grep . stderr && exit 1 -./missing --run ./missing --grep 2>stderr && { cat stderr >&2; exit 1; } -cat stderr >&2 ++run_cmd ./missing ./missing --version || exit 1 +grep 'missing .*(GNU [aA]utomake)' stdout - test -s stderr && Exit 1 - run_cmd ./missing ./missing --grep && Exit 1 - grep WARNING stderr && Exit 1 ++test -s stderr && exit 1 ++run_cmd ./missing ./missing --grep && exit 1 + grep WARNING stderr && exit 1 -grep Unknown stderr +grep "missing:.* unknown '--grep'" stderr + +: diff --cc t/objc-flags.sh index 25f805b,e98a811..2f65d46 --- a/t/objc-flags.sh +++ b/t/objc-flags.sh @@@ -52,11 -52,11 +52,11 @@@ $AUTOCON $AUTOMAKE -a $FGREP OBJCFLAGS Makefile.in # For debugging. - grep '\$(OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && Exit 1 - grep '\$(OBJCFLAGS).*\$(foo.*_OBJCFLAGS)' Makefile.in && Exit 1 - grep '\$(foo.*_OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && Exit 1 + grep '\$(OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && exit 1 + grep '\$(OBJCFLAGS).*\$(foo.*_OBJCFLAGS)' Makefile.in && exit 1 + grep '\$(foo.*_OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && exit 1 ./configure OBJCFLAGS=-UERROR -$MAKE +$MAKE : diff --cc t/objcxx-deps.sh index c072da2,fef4ac5..950663b --- a/t/objcxx-deps.sh +++ b/t/objcxx-deps.sh @@@ -17,9 -17,11 +17,9 @@@ # Automatic dependency tracking for Objective C++. # See also sister test 'objc-deps.sh'. - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX AC_OUTPUT END diff --cc t/objcxx-flags.sh index 082f7fb,8f5df45..6e79fc5 --- a/t/objcxx-flags.sh +++ b/t/objcxx-flags.sh @@@ -17,9 -17,11 +17,9 @@@ # Test Objective C++ compilation flags. # See also sister test 'objc-flags.sh'. - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX AC_OUTPUT END @@@ -53,11 -62,11 +53,11 @@@ $AUTOCON $AUTOMAKE -a $FGREP OBJCXXFLAGS Makefile.in # For debugging. - grep '\$(OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && Exit 1 - grep '\$(OBJCXXFLAGS).*\$(foo.*_OBJCXXFLAGS)' Makefile.in && Exit 1 - grep '\$(foo.*_OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && Exit 1 + grep '\$(OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && exit 1 + grep '\$(OBJCXXFLAGS).*\$(foo.*_OBJCXXFLAGS)' Makefile.in && exit 1 + grep '\$(foo.*_OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && exit 1 ./configure OBJCXXFLAGS=-UERROR -$MAKE +$MAKE : diff --cc t/objcxx-minidemo.sh index e1eabca,e4e7767..cf62e31 --- a/t/objcxx-minidemo.sh +++ b/t/objcxx-minidemo.sh @@@ -18,9 -18,11 +18,9 @@@ # See also sister test 'objc-minidemo.sh'. required=native - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX AC_CONFIG_HEADERS([config.h]) AC_OUTPUT diff --cc t/parallel-tests-driver-install.sh index a04e9b1,aa9ac12..78dff6b --- a/t/parallel-tests-driver-install.sh +++ b/t/parallel-tests-driver-install.sh @@@ -15,11 -15,15 +15,11 @@@ # along with this program. If not, see . # Check that auxiliary script 'test-driver' gets automatically installed -# in the correct directory by 'parallel-tests' option. +# in the correct directory. +am_create_testdir=empty - . ./defs || Exit 1 + . ./defs || exit 1 -: Try first with parallel-tests defined in AM_INIT_AUTOMAKE. - -mkdir am-init-automake -cd am-init-automake - cat > configure.ac <. -# Check parallel-tests interactions with "make -n". +# Check interactions between the parallel test harness and "make -n". # See also sister test 'parallel-tests-dry-run-2.test'. - . ./defs || Exit 1 + . ./defs || exit 1 echo AC_OUTPUT >> configure.ac diff --cc t/parallel-tests-dry-run-2.sh index f3ce42e,0bd6523..940cab2 --- a/t/parallel-tests-dry-run-2.sh +++ b/t/parallel-tests-dry-run-2.sh @@@ -14,10 -14,10 +14,10 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Check parallel-tests interactions with "make -n". +# Check interactions between the parallel test harness and "make -n". # See also sister test 'parallel-tests-dry-run-1.test'. - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --cc t/parallel-tests-many.sh index b2c1f76,420a54a..a12f534 --- a/t/parallel-tests-many.sh +++ b/t/parallel-tests-many.sh @@@ -14,11 -14,11 +14,11 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Check that the parallel-tests harness does not hit errors due to -# an exceeded command line length when there are many tests. +# Check that the parallel testsuite harness does not hit errors due +# to an exceeded command line length when there are many tests. # For automake bug#7868. This test is currently expected to fail. - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --cc t/parallel-tests-subdir.sh index 336fcd8,d57133f..b7bb481 --- a/t/parallel-tests-subdir.sh +++ b/t/parallel-tests-subdir.sh @@@ -14,10 -14,10 +14,10 @@@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Check that the parallel-tests driver creates parent directories for +# Check that the parallel test harness creates parent directories for # the log files when needed. - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --cc t/remake6.sh index b5e9646,b6c580c..2146b38 --- a/t/remake6.sh +++ b/t/remake6.sh @@@ -37,9 -37,9 +37,9 @@@ $MAK do_check () { - $MAKE >stdout || { cat stdout; Exit 1; } + $MAKE >stdout || { cat stdout; exit 1; } cat stdout - test $(grep -c " --run " stdout) -eq 1 + test $(grep -c "/missing " stdout) -eq 1 } # Now, we are set up. Ensure that, for either missing Makefile.in, diff --cc t/req.sh index b814ae7,cfeb44c..27b0ab1 --- a/t/req.sh +++ b/t/req.sh @@@ -16,10 -16,10 +16,10 @@@ # Test to make sure macro used in m4 file is included. - . ./defs || Exit 1 + . ./defs || exit 1 cat > configure.ac <> configure.ac <<'EOF' -AM_SILENT_RULES +# This line will be edited later to force silent-rules default. AC_OUTPUT EOF diff --cc t/silent6.sh index c7e7819,3593adf..a4b0f69 --- a/t/silent6.sh +++ b/t/silent6.sh @@@ -16,9 -16,10 +16,9 @@@ # Check user extensibility of silent-rules mode. - . ./defs || Exit 1 + . ./defs || exit 1 cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_OUTPUT EOF diff --cc t/silent7.sh index 716eada,898a442..5e5472e --- a/t/silent7.sh +++ b/t/silent7.sh @@@ -15,11 -15,13 +15,11 @@@ # along with this program. If not, see . # Check user extensibility of silent-rules mode. +# Aslo check that silent rules are disabled by default. - . ./defs || Exit 1 + . ./defs || exit 1 -cat >>configure.ac <<'EOF' -AM_SILENT_RULES -AC_OUTPUT -EOF +echo AC_OUTPUT >> configure.ac cat > Makefile.am <<'EOF' all-local: foo @@@ -39,12 -41,10 +39,12 @@@ $ACLOCA $AUTOMAKE --add-missing $AUTOCONF -./configure --disable-silent-rules +# Silent rules are disabled by default, since we haven't called +# "AM_SILENT_RULES([yes])" explicitly. +./configure - $MAKE >stdout || { cat stdout; Exit 1; } + $MAKE >stdout || { cat stdout; exit 1; } cat stdout - grep 'GEN ' stdout && Exit 1 + grep 'GEN ' stdout && exit 1 grep 'cp ' stdout grep 'echo ' stdout diff --cc t/silent8.sh index 6a82008,76bf62c..5d7b135 --- a/t/silent8.sh +++ b/t/silent8.sh @@@ -16,10 -16,13 +16,10 @@@ # Check texinfo rules in silent-rules mode. -required='makeinfo-html tex texi2dvi-o dvips' +required='makeinfo tex texi2dvi dvips' - . ./defs || Exit 1 + . ./defs || exit 1 -cat >>configure.ac <<'EOF' -AM_SILENT_RULES -AC_OUTPUT -EOF +echo AC_OUTPUT >> configure.ac cat > Makefile.am <<'EOF' info_TEXINFOS = foo.texi diff --cc t/stamph2.sh index 5346bfc,c666391..e2ccbda --- a/t/stamph2.sh +++ b/t/stamph2.sh @@@ -15,12 -15,13 +15,12 @@@ # along with this program. If not, see . # Make sure stamp-h* files are created where we expect - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << END -AM_CONFIG_HEADER([1.h - 2.h:config.hin - 3.h:sdir1/config1.hin]) -# AM_CONFIG_HEADER and AC_CONFIG_HEADERS should be synonyms. +AC_CONFIG_HEADERS([1.h + 2.h:config.hin + 3.h:sdir1/config1.hin]) AC_CONFIG_HEADERS([sdir1/4.h sdir1/5.h:config.hin sdir1/6.h:sdir1/config1.hin diff --cc t/txinfo-no-clutter.sh index 43b83da,3de21b4..3dc1a29 --- a/t/txinfo-no-clutter.sh +++ b/t/txinfo-no-clutter.sh @@@ -17,8 -17,8 +17,8 @@@ # The pdf, ps and dvi targets shouldn't let clutter in the build directory. # Related to automake bug#11146. -required='makeinfo tex texi2dvi-o dvips' +required='makeinfo tex texi2dvi dvips' - . ./defs || Exit 1 + . ./defs || exit 1 mkdir sub @@@ -93,8 -93,7 +93,8 @@@ for fmt in info pdf ps dvi html all; d $MAKE $fmt ls -l . sub # For debugging. ls -d foo* baz* sub/bar* > lst - $EGREP -v '^(foo|sub/bar|baz)\.(texi|dvi|ps|pdf|html|info)$' lst && exit 1 + $EGREP -v '^(foo|sub/bar|baz)\.(texi|dvi|ps|pdf|html|info|t2[dp])$' \ - lst && Exit 1 ++ lst && exit 1 $MAKE clean done diff --cc t/txinfo13.sh index d3a7079,6c06942..2f9938b --- a/t/txinfo13.sh +++ b/t/txinfo13.sh @@@ -18,8 -18,8 +18,8 @@@ # Also make sure we do not distribute too much foo.info* files (Report # from Vincent Lefevre). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' - . ./defs || Exit 1 + . ./defs || exit 1 echo AC_OUTPUT >> configure.ac diff --cc t/txinfo21.sh index fd9e679,9936c0e6..5ad1254 --- a/t/txinfo21.sh +++ b/t/txinfo21.sh @@@ -17,8 -17,8 +17,8 @@@ # Test support for building HTML documentation, and the many # install-DOC flavors. -required='makeinfo-html tex texi2dvi' +required='makeinfo tex texi2dvi' - . ./defs || Exit 1 + . ./defs || exit 1 cat >>configure.ac <<\EOF AC_CONFIG_FILES([rec/Makefile]) diff --cc t/txinfo23.sh index 4ac9e9f,02b2ca1..ebf62b0 --- a/t/txinfo23.sh +++ b/t/txinfo23.sh @@@ -19,8 -19,8 +19,8 @@@ # (Similar to txinfo13.test, plus DISTCLEANFILES). # (See also txinfo24.test and txinfo25.test). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --cc t/txinfo24.sh index ecf4e9c,e7bc964..c613bd6 --- a/t/txinfo24.sh +++ b/t/txinfo24.sh @@@ -18,8 -18,8 +18,8 @@@ # (Similar to txinfo16.test, plus CLEANFILES). # (See also txinfo23.test and txinfo25.test). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --cc t/txinfo25.sh index 0d217d5,15f5544..46dfc50 --- a/t/txinfo25.sh +++ b/t/txinfo25.sh @@@ -20,8 -20,8 +20,8 @@@ # (Similar to txinfo16.test, plus CLEANFILES). # (See also txinfo23.test and txinfo24.test). -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' - . ./defs || Exit 1 + . ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --cc t/txinfo28.sh index cd09f41,e6613b4..9bcf6e2 --- a/t/txinfo28.sh +++ b/t/txinfo28.sh @@@ -19,8 -19,8 +19,8 @@@ # references. # Report from Ralf Corsepius. -required='makeinfo tex texi2dvi-o' +required='makeinfo tex texi2dvi' - . ./defs || Exit 1 + . ./defs || exit 1 # This setting, when honored by GNU ls, used to cause an infinite loop # in mdate-sh. diff --cc t/txinfo33.sh index d35d0d3,28c9f1a..b457cb0 --- a/t/txinfo33.sh +++ b/t/txinfo33.sh @@@ -17,8 -17,8 +17,8 @@@ # DVIS, PDFS, PSS, HTMLS should not be cleaned upon 'mostlyclean'. # Similar to txinfo25.test. -required='makeinfo tex texi2dvi-o dvips' +required='makeinfo tex texi2dvi dvips' - . ./defs || Exit 1 + . ./defs || exit 1 mkdir sub diff --cc t/vtexi4.sh index 975bf0e,864818f..8e77e86 --- a/t/vtexi4.sh +++ b/t/vtexi4.sh @@@ -21,8 -21,8 +21,8 @@@ # for more vers*.texi files, and does not require makeinfo, tex and # texi2dvi. -required='makeinfo tex texi2dvi-o grep-nonprint' +required='makeinfo tex texi2dvi grep-nonprint' - . ./defs || Exit 1 + . ./defs || exit 1 test $(LC_ALL=C date '+%u') -gt 0 && test $(LC_ALL=C date '+%u') -lt 8 \ && day=$(LC_ALL=C date '+%d') && test -n "$day" \