[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-813-gcbfbccc |
|
Date: |
Tue, 03 May 2011 09:05:07 +0000 |
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=cbfbccce3e2e56fdf2a5844e6c73db2cb3099a64
The branch, testsuite-work has been updated
via cbfbccce3e2e56fdf2a5844e6c73db2cb3099a64 (commit)
via 255e7b7a585001d830e0bc4f69528ee26981103b (commit)
from 3c91fc9a36fb802e05d47308b7e0f3ecf3bcf77a (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 cbfbccce3e2e56fdf2a5844e6c73db2cb3099a64
Author: Stefano Lattarini <address@hidden>
Date: Mon May 2 19:04:01 2011 +0200
tests: few more checks on automatic remake support
* tests/remake-all-1.test: New test, check that the "all" target
triggers rebuilt of outdated Makefiles.
* tests/remake-all-2.test: Likewise, but for when the makefiles
are not named `Makefile'.
* tests/Makefile.am (TESTS): Update.
commit 255e7b7a585001d830e0bc4f69528ee26981103b
Author: Stefano Lattarini <address@hidden>
Date: Mon May 2 18:05:34 2011 +0200
tests: check some remake features with non-GNU make too
* tests/acloca14.test ($required): Drop "GNUmake". This test
works as-is with non-GNU make implementations.
* tests/remake1a.test: Likewise.
* tests/aclocal4.test ($required): Drop "GNUmake".
Modify the test to have it work also with non-GNU make.
* tests/remake5.test: Likewise.
* tests/remake8a.test: Likewise.
* tests/remake8b.test: Likewise.
* tests/remake9a.test: Likewise.
* tests/remake9b.test: Likewise.
* tests/remake9c.test: Likewise.
* tests/remake9d.test: Likewise.
* tests/remake10a.test: Likewise.
* tests/remake10b.test: Likewise.
* tests/remake10c.test: Likewise.
* tests/remake12.test: ($required): Drop "GNUmake".
Adapt the test to make it work also with non-GNU make (if
it supports an "include" directive).
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 31 +++++++++++
tests/Makefile.am | 2 +
tests/Makefile.in | 2 +
tests/acloca14.test | 1 -
tests/aclocal4.test | 8 ++--
tests/{remake1a.test => remake-all-1.test} | 51 +++++++++++-------
tests/remake-all-2.test | 75 ++++++++++++++++++++++++++++
tests/remake10a.test | 16 ++++--
tests/remake10b.test | 16 ++++--
tests/remake10c.test | 17 ++++--
tests/remake12.test | 34 +++++++++++--
tests/remake1a.test | 1 -
tests/remake5.test | 15 ++++--
tests/remake8a.test | 5 +-
tests/remake8b.test | 5 +-
tests/remake9a.test | 12 +++-
tests/remake9b.test | 12 +++-
tests/remake9c.test | 12 +++-
tests/remake9d.test | 12 +++-
19 files changed, 258 insertions(+), 69 deletions(-)
copy tests/{remake1a.test => remake-all-1.test} (51%)
create mode 100755 tests/remake-all-2.test
diff --git a/ChangeLog b/ChangeLog
index 541955c..4c04c15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2011-05-03 Stefano Lattarini <address@hidden>
+
+ tests: few more checks on automatic remake support
+ * tests/remake-all-1.test: New test, check that the "all" target
+ triggers rebuilt of outdated Makefiles.
+ * tests/remake-all-2.test: Likewise, but for when the makefiles
+ are not named `Makefile'.
+ * tests/Makefile.am (TESTS): Update.
+
+2011-05-03 Stefano Lattarini <address@hidden>
+
+ tests: check some remake features with non-GNU make too
+ * tests/acloca14.test ($required): Drop "GNUmake". This test
+ works as-is with non-GNU make implementations.
+ * tests/remake1a.test: Likewise.
+ * tests/aclocal4.test ($required): Drop "GNUmake".
+ Modify the test to have it work also with non-GNU make.
+ * tests/remake5.test: Likewise.
+ * tests/remake8a.test: Likewise.
+ * tests/remake8b.test: Likewise.
+ * tests/remake9a.test: Likewise.
+ * tests/remake9b.test: Likewise.
+ * tests/remake9c.test: Likewise.
+ * tests/remake9d.test: Likewise.
+ * tests/remake10a.test: Likewise.
+ * tests/remake10b.test: Likewise.
+ * tests/remake10c.test: Likewise.
+ * tests/remake12.test: ($required): Drop "GNUmake".
+ Adapt the test to make it work also with non-GNU make (if
+ it supports an "include" directive).
+
2011-05-01 Stefano Lattarini <address@hidden>
tests: extend tests on dependency tracking with VPATH
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 56e5859..0cba6a8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -822,6 +822,8 @@ remake10b.test \
remake10c.test \
remake11.test \
remake12.test \
+remake-all-1.test \
+remake-all-2.test \
remake-gnulib-add-acsubst.test \
remake-gnulib-add-header.test \
remake-gnulib-remove-header.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index e44b2e7..fd06043 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1082,6 +1082,8 @@ remake10b.test \
remake10c.test \
remake11.test \
remake12.test \
+remake-all-1.test \
+remake-all-2.test \
remake-gnulib-add-acsubst.test \
remake-gnulib-add-header.test \
remake-gnulib-remove-header.test \
diff --git a/tests/acloca14.test b/tests/acloca14.test
index 0371ef5..d919aab 100755
--- a/tests/acloca14.test
+++ b/tests/acloca14.test
@@ -17,7 +17,6 @@
# Make sure m4_included files are also scanned for definitions.
# Report from Phil Edwards.
-required=GNUmake
. ./defs || Exit 1
cat >> configure.in << 'END'
diff --git a/tests/aclocal4.test b/tests/aclocal4.test
index e18684b..7b637bd 100755
--- a/tests/aclocal4.test
+++ b/tests/aclocal4.test
@@ -17,8 +17,6 @@
# Make sure dependencies on aclocal.m4 are set correctly.
# Report from Jim Meyering.
-# We need GNU make for the `rebuild rules' to be triggered.
-required=GNUmake
. ./defs || Exit 1
cat >>configure.in <<EOF
@@ -63,11 +61,13 @@ $AUTOMAKE
$MAKE check-not-foo
# Update one of the macros. This should cause ./configure, Makefile.in,
-# Makefile, lib/Makefile.in, and lib/Makfile to be updated. This assumes
-# GNU make.
+# Makefile, lib/Makefile.in, and lib/Makefile to be updated.
cat >m4/mymacro.m4 <<'EOF'
AC_DEFUN([MY_MACRO], [AC_LIBOBJ([foo])])
EOF
+using_gmake || $MAKE
$MAKE check-foo
+
+:
diff --git a/tests/remake1a.test b/tests/remake-all-1.test
similarity index 51%
copy from tests/remake1a.test
copy to tests/remake-all-1.test
index a794a05..670b46a 100755
--- a/tests/remake1a.test
+++ b/tests/remake-all-1.test
@@ -14,43 +14,54 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Make sure remaking rules in subdir are correctly generated.
-# See also sister "grepping" test `remake.test'.
+# Check that the "all" target triggers rebuilt of outdated Makefiles.
+# See also sister test `remake-all-2.test'.
-required=GNUmake
. ./defs || Exit 1
-fingerprint='=/FiNgErPrInT/='
+mkfile=Makefile
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+magic3=%%MagicStringThree%%
cat > configure.in <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([sub/Makefile])
+AC_CONFIG_FILES([$mkfile sub/$mkfile])
+FOO='$magic1'
AC_OUTPUT
END
mkdir sub
-: > sub/Makefile.am
+echo SUBDIRS = sub > $mkfile.am
+: > sub/$mkfile.am
$ACLOCAL
-$AUTOCONF
$AUTOMAKE
+$EGREP "^all-am:.* $mkfile( |$)" $mkfile.in sub/$mkfile.in
+
+$AUTOCONF
./configure
-# Rebuild rules should work even if there is no top-level
-# makefiles, if we are careful enough to trigger them only
-# in proper subdirs
+$FGREP "$magic1" mkfile.in && Exit 1 # Sanity check.
+
+# Two code paths in configure.am:
+
+# - either a file in $(am__configure_deps) has been updated ...
+$sleep
+echo "AC_SUBST([FOO])" >> configure.in
+$MAKE
+$FGREP FOO $mkfile # For debugging.
+$FGREP $magic1 $mkfile
+
+# - ... or not; i.e., Makefile.am or an included file has.
$sleep
-echo "# $fingerprint" > sub/Makefile.am
-cd sub
-$MAKE Makefile
-cd ..
-# Check that no spurious Makefile has been created in the
-# top-level directory.
-test ! -r Makefile
-# Check that the Makefile in the subdirectory has been properly
-# updated.
-$FGREP "$fingerprint" sub/Makefile
+echo "# $magic2" >> $mkfile.am
+echo "# $magic3" >> sub/$mkfile.am
+$MAKE
+$FGREP $magic2 $mkfile
+$FGREP $magic3 sub/$mkfile
:
diff --git a/tests/remake-all-2.test b/tests/remake-all-2.test
new file mode 100755
index 0000000..395ef69
--- /dev/null
+++ b/tests/remake-all-2.test
@@ -0,0 +1,75 @@
+#! /bin/sh
+# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# 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 the "all" target triggers rebuilt of outdated makefiles.
+# This handle the case in which the makefiles are not called `Makefile'.
+# See also sister test `remake-all-1.test'.
+
+. ./defs || Exit 1
+
+mkfile=foobar
+
+magic1=::MagicStringOne::
+magic2=__MagicStringTwo__
+magic3=%%MagicStringThree%%
+
+cat > configure.in <<END
+AC_INIT([$me], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([$mkfile sub/$mkfile])
+FOO='$magic1'
+AC_OUTPUT
+END
+
+mkdir sub
+
+cat > $mkfile.am <<END
+SUBDIRS = sub
+AM_MAKEFLAGS = -f $mkfile
+END
+
+cat > sub/$mkfile.am <<END
+AM_MAKEFLAGS = -f $mkfile
+END
+
+$ACLOCAL
+$AUTOMAKE
+
+$EGREP "^all-am:.* $mkfile( |$)" $mkfile.in sub/$mkfile.in
+
+$AUTOCONF
+./configure
+
+$FGREP "$magic1" mkfile.in && Exit 1 # Sanity check.
+
+# Two code paths in configure.am:
+
+# - either a file in $(am__configure_deps) has been updated ...
+$sleep
+echo "AC_SUBST([FOO])" >> configure.in
+$MAKE -f $mkfile
+$FGREP FOO $mkfile # For debugging.
+$FGREP $magic1 $mkfile
+
+# - ... or not; i.e., Makefile.am or an included file has.
+$sleep
+echo "# $magic2" >> $mkfile.am
+echo "# $magic3" >> sub/$mkfile.am
+$MAKE -f $mkfile
+$FGREP $magic2 $mkfile
+$FGREP $magic3 sub/$mkfile
+
+:
diff --git a/tests/remake10a.test b/tests/remake10a.test
index 7da457c..78b15b0 100755
--- a/tests/remake10a.test
+++ b/tests/remake10a.test
@@ -18,13 +18,18 @@
# configure.ac.
# Keep in sync with sister tests `remake10b.test' and `remake10c.test'.
-required=GNUmake
. ./defs || Exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
magic3=%%MagicStringThree%%
+if using_gmake; then
+ remake="$MAKE nil"
+else
+ remake="$MAKE Makefile"
+fi
+
cat >> configure.in <<END
m4_include([foo.m4])
AC_SUBST([FINGERPRINT], [my_fingerprint])
@@ -63,13 +68,13 @@ for vpath in : false; do
$sleep
echo "m4_define([my_fingerprint], [$magic1])" > $top_srcdir/foo.m4
- $MAKE nil
+ $remake
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile
$sleep
echo "m4_define([my_fingerprint], [$magic2])" > $top_srcdir/foo.m4
- $MAKE nil
+ $remake
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile && Exit 1
$FGREP $magic2 Makefile
@@ -77,7 +82,7 @@ for vpath in : false; do
$sleep
echo "m4_include([bar.m4])" > $top_srcdir/foo.m4
echo "m4_define([my_fingerprint], [$magic3])" > $top_srcdir/bar.m4
- $MAKE nil
+ $remake
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile && Exit 1
$FGREP $magic2 Makefile && Exit 1
@@ -85,13 +90,14 @@ for vpath in : false; do
$sleep
echo "m4_define([my_fingerprint], [$magic1])" > $top_srcdir/bar.m4
- $MAKE nil
+ $remake
$FGREP $magic2 Makefile && Exit 1
$FGREP $magic3 Makefile && Exit 1
$FGREP $magic1 Makefile
$sleep
echo "m4_define([my_fingerprint], [DummyValue])" > $top_srcdir/foo.m4
+ using_gmake || $remake
$MAKE distcheck
$FGREP $magic1 Makefile && Exit 1 # sanity check
$FGREP $magic2 Makefile && Exit 1 # likewise
diff --git a/tests/remake10b.test b/tests/remake10b.test
index 0672fc9..2c193cd 100755
--- a/tests/remake10b.test
+++ b/tests/remake10b.test
@@ -18,13 +18,18 @@
# Makefile.am.
# Keep in sync with sister tests `remake10a.test' and `remake10c.test'.
-required=GNUmake
. ./defs || Exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
magic3=%%MagicStringThree%%
+if using_gmake; then
+ remake="$MAKE nil"
+else
+ remake="$MAKE Makefile"
+fi
+
cat >> configure.in <<'END'
AC_OUTPUT
END
@@ -62,13 +67,13 @@ for vpath in : false; do
$sleep
echo "FINGERPRINT = $magic1" > $top_srcdir/foo.am
- $MAKE nil
+ $remake
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile
$sleep
echo "FINGERPRINT = $magic2" > $top_srcdir/foo.am
- $MAKE nil
+ $remake
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile && Exit 1
$FGREP $magic2 Makefile
@@ -76,7 +81,7 @@ for vpath in : false; do
$sleep
echo 'include $(top_srcdir)/bar.am' > $top_srcdir/foo.am
echo "FINGERPRINT = $magic3" > $top_srcdir/bar.am
- $MAKE nil
+ $remake
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile && Exit 1
$FGREP $magic2 Makefile && Exit 1
@@ -84,13 +89,14 @@ for vpath in : false; do
$sleep
echo "FINGERPRINT = $magic1" > $top_srcdir/bar.am
- $MAKE nil
+ $remake
$FGREP $magic2 Makefile && Exit 1
$FGREP $magic3 Makefile && Exit 1
$FGREP $magic1 Makefile
$sleep
echo "FINGERPRINT = DummyValue" > $top_srcdir/foo.am
+ using_gmake || $remake
$MAKE distcheck
$FGREP $magic1 Makefile && Exit 1 # sanity check
$FGREP $magic2 Makefile && Exit 1 # likewise
diff --git a/tests/remake10c.test b/tests/remake10c.test
index 9b9aca9..d20c1e8 100755
--- a/tests/remake10c.test
+++ b/tests/remake10c.test
@@ -18,13 +18,18 @@
# aclocal.m4.
# Keep in sync with sister tests `remake10a.test' and `remake10b.test'.
-required=GNUmake
. ./defs || Exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
magic3=%%MagicStringThree%%
+if using_gmake; then
+ remake="$MAKE nil"
+else
+ remake="$MAKE Makefile"
+fi
+
cat >> configure.in <<END
FINGERPRINT='my_fingerprint'
AC_SUBST([FINGERPRINT])
@@ -65,13 +70,13 @@ for vpath in : false; do
$sleep
echo "AC_DEFUN([my_fingerprint], [$magic1])" > $top_srcdir/m4/foo.m4
- $MAKE nil
+ $remake
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile
$sleep
echo "AC_DEFUN([my_fingerprint], [$magic2])" > $top_srcdir/m4/foo.m4
- $MAKE nil
+ $remake
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile && Exit 1
$FGREP $magic2 Makefile
@@ -79,7 +84,7 @@ for vpath in : false; do
$sleep
echo "m4_include([m4/bar.m4])" > $top_srcdir/m4/foo.m4
echo "AC_DEFUN([my_fingerprint], [$magic3])" > $top_srcdir/m4/bar.m4
- $MAKE nil
+ $remake
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile && Exit 1
$FGREP $magic2 Makefile && Exit 1
@@ -87,7 +92,7 @@ for vpath in : false; do
$sleep
echo "AC_DEFUN([my_fingerprint], [$magic1])" > $top_srcdir/m4/bar.m4
- $MAKE nil
+ $remake
$FGREP $magic2 Makefile && Exit 1
$FGREP $magic3 Makefile && Exit 1
$FGREP $magic1 Makefile
@@ -95,7 +100,7 @@ for vpath in : false; do
$sleep
echo "AC_DEFUN([my_fingerprint], [DummyValue])" > $top_srcdir/m4/foo.m4
echo "AC_DEFUN([AM_UNUSED], [NoSuchMacro])" > $top_srcdir/m4/bar.m4
- $MAKE nil # required to work around limitation of GNU make 3.82
+ using_gmake || $remake
$MAKE distcheck
$FGREP $magic1 Makefile && Exit 1 # sanity check
$FGREP $magic2 Makefile && Exit 1 # likewise
diff --git a/tests/remake12.test b/tests/remake12.test
index fe14885..d6c1ef2 100755
--- a/tests/remake12.test
+++ b/tests/remake12.test
@@ -17,13 +17,27 @@
# Test basic remake rules for Makefiles with non-default names
# and/or with multiple sources.
-required=GNUmake
. ./defs || Exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
magic3=%%MagicStringThree%%
+# See if the user's make implementation support an include directive.
+# We need it in this test.
+echo 'all:; @echo include is supported' > incl.mk
+echo 'include incl.mk' > gnu-style.mk
+echo '.include "incl.mk"' > bsd-style.mk
+if $MAKE -f gnu-style.mk | grep 'include is supported'; then
+ echo "$me: GNU make include style supported"
+ include_zardoz='include zardoz'
+elif $MAKE -f bsd-style.mk | grep 'include is supported'; then
+ echo "$me: BSD make include style supported"
+ include_zardoz='.include "zardoz"'
+else
+ skip_ "make doesn't support any \"include\" directive"
+fi
+
cat > configure.in <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE
@@ -38,7 +52,7 @@ EXTRA_DIST = Makefile
END
cat > Makefile <<END
-include zardoz
+$include_zardoz
nil:
.PHONY: nil
END
@@ -49,7 +63,11 @@ $AUTOMAKE
./configure
-$MAKE nil
+if using_gmake; then
+ $MAKE nil
+else
+ $MAKE Makefile
+fi
grep '^#H:' zardoz.in # for debugging
$FGREP $magic1 zardoz
$FGREP $magic1 zardoz.in
@@ -84,7 +102,11 @@ check-local: my-check
END
mv -f t zardoz.am
cat zardoz.am # for debugging
-$MAKE nil
+if using_gmake; then
+ $MAKE nil
+else
+ $MAKE zardoz
+fi
$FGREP my-check zardoz # sanity check
$FGREP $magic1 zardoz zardoz.in && Exit 1
$FGREP $magic2 zardoz
@@ -101,6 +123,7 @@ sed '/^#H:/d' zardoz.am > quux.am
echo 'FOO = dummy' >> quux.am
echo 'BAR = $(BAZ)' > top.in
echo "BAZ = $magic3" > bot.in
+is_gmake || $MAKE zardoz
$MAKE test
$FGREP my-check zardoz # sanity check
$FGREP $magic3 quux.in && Exit 1
@@ -110,11 +133,14 @@ $FGREP $magic2 zardoz && Exit 1
# After the remake above, the files `zardoz.am' and `zardoz.in'
# should be no more needed
echo 'endif' > zardoz.am # put in syntax error
+is_gmake || $MAKE zardoz
$MAKE test
rm -f zardoz.in zardoz.am # get rid of them
+is_gmake || $MAKE zardoz
$MAKE test
echo 'FOO = $(BAR)' >> quux.am
+is_gmake || $MAKE zardoz
$MAKE distcheck
:
diff --git a/tests/remake1a.test b/tests/remake1a.test
index a794a05..fc5ba6d 100755
--- a/tests/remake1a.test
+++ b/tests/remake1a.test
@@ -17,7 +17,6 @@
# Make sure remaking rules in subdir are correctly generated.
# See also sister "grepping" test `remake.test'.
-required=GNUmake
. ./defs || Exit 1
fingerprint='=/FiNgErPrInT/='
diff --git a/tests/remake5.test b/tests/remake5.test
index d3bfc10..2c4571f 100755
--- a/tests/remake5.test
+++ b/tests/remake5.test
@@ -18,9 +18,14 @@
# but not all.
# Report from Ralf Corsepius.
-required=GNUmake
. ./defs || Exit 1
+if using_gmake; then
+ remake="$MAKE"
+else
+ remake="$MAKE Makefile"
+fi
+
cat >>configure.in <<'EOF'
AM_MAINTAINER_MODE
m4_include([foo.m4])
@@ -46,12 +51,12 @@ $MAKE
# tools are set to false.)
$sleep
touch aclocal.m4 Makefile.am configure.in foo.m4
-$MAKE
+$remake
# Make sure the rebuild rule for Makefile is triggered.
$sleep
echo '# GrEpMe' >>Makefile.in
-$MAKE
+$remake
grep GrEpMe Makefile
# Make sure the rebuild rule for config.status is triggered.
@@ -59,14 +64,14 @@ $sleep
grep 'AUTOCONF.*=.*false' Makefile
: > rebuild_ok
./configure --no-create
-$MAKE
+$remake
grep 'AUTOCONF.*=.*false' Makefile && Exit 1
# Make sure rebuild rules do work if --enable-maintainer-mode is given.
./configure --enable-maintainer-mode
$sleep
echo 'AC_SUBST([YIPPY_YIPPY_YEAH])' >foo.m4
-$MAKE
+$remake
grep YIPPY_YIPPY_YEAH Makefile
# Try the distribution, for completeness.
diff --git a/tests/remake8a.test b/tests/remake8a.test
index c625e32..10a6c5a 100755
--- a/tests/remake8a.test
+++ b/tests/remake8a.test
@@ -21,7 +21,6 @@
# Keep this in sync with sister test `remake8b.test', which performs the
# same checks for a VPATH build.
-required=GNUmake
. ./defs || Exit 1
mv -f configure.in configure.stub
@@ -71,6 +70,7 @@ check-local:
CLEANFILES = bar
END
+using_gmake || $MAKE Makefile
$MAKE
cat bar
grep '!Baz!' bar
@@ -84,7 +84,6 @@ rm -f bar
$sleep
cat > $srcdir/Makefile.am <<'END'
-all-local: quux
check-local:
cat quux
grep '!Zardoz!' quux
@@ -102,6 +101,7 @@ cat > $srcdir/quux.in <<'END'
address@hidden@!
END
+using_gmake || $MAKE Makefile
$MAKE
cat quux
grep '!Zardoz!' quux
@@ -119,7 +119,6 @@ mkdir $srcdir/m4
cat > $srcdir/Makefile.am <<'END'
ACLOCAL_AMFLAGS = -I m4
-all-local: quux
check-local:
cat quux
grep '%Foo%' quux
diff --git a/tests/remake8b.test b/tests/remake8b.test
index 86f0f8e..461940c 100755
--- a/tests/remake8b.test
+++ b/tests/remake8b.test
@@ -21,7 +21,6 @@
# Keep this in sync with sister test `remake8a.test', which performs the
# same checks for a in-tree build.
-required=GNUmake
. ./defs || Exit 1
mv -f configure.in configure.stub
@@ -73,6 +72,7 @@ check-local:
CLEANFILES = bar
END
+using_gmake || $MAKE Makefile
$MAKE
cat bar
grep '!Baz!' bar
@@ -86,7 +86,6 @@ rm -f bar
$sleep
cat > $srcdir/Makefile.am <<'END'
-all-local: quux
check-local:
cat quux
grep '!Zardoz!' quux
@@ -104,6 +103,7 @@ cat > $srcdir/quux.in <<'END'
address@hidden@!
END
+using_gmake || $MAKE Makefile
$MAKE
cat quux
grep '!Zardoz!' quux
@@ -121,7 +121,6 @@ mkdir $srcdir/m4
cat > $srcdir/Makefile.am <<'END'
ACLOCAL_AMFLAGS = -I m4
-all-local: quux
check-local:
cat quux
grep '%Foo%' quux
diff --git a/tests/remake9a.test b/tests/remake9a.test
index d46f317..9139b46 100755
--- a/tests/remake9a.test
+++ b/tests/remake9a.test
@@ -17,12 +17,17 @@
# Test remake rules when configure.in or its prerequisites change.
# Keep in sync with the other sister tests `remake9*.test'.
-required=GNUmake
. ./defs || Exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
+if using_gmake; then
+ remake_() { $MAKE nil; }
+else
+ remake_() { $MAKE Makefile && $MAKE foo.sh; }
+fi
+
cat >> configure.in <<END
FINGERPRINT=BadBadBad
AC_SUBST([FINGERPRINT])
@@ -73,7 +78,7 @@ for vpath in : false; do
$sleep
sed "s/^\\(FINGERPRINT\\)=.*/\\1=$magic1/" $srcdir/configure.in >t
mv -f t $srcdir/configure.in
- $MAKE nil
+ remake_
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile
test x"`./foo.sh`" = x"$magic1"
@@ -81,7 +86,7 @@ for vpath in : false; do
$sleep
echo 'sed "s/^\\(FINGERPRINT\\)=.*/\\1='$magic2'/"' \
> $srcdir/tweak-configure-in
- $MAKE nil
+ remake_
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile && Exit 1
$FGREP $magic2 Makefile
@@ -91,6 +96,7 @@ for vpath in : false; do
echo cat > $srcdir/tweak-configure-in # no-op again
sed "s/^\\(FINGERPRINT\\)=.*/\\1=DummyValue/" $srcdir/configure.in >t
mv -f t $srcdir/configure.in
+ using_gmake || remake_
$MAKE distcheck
$FGREP $magic1 Makefile && Exit 1 # sanity check
$FGREP $magic2 Makefile && Exit 1 # likewise
diff --git a/tests/remake9b.test b/tests/remake9b.test
index 680ce9a..6c650c4 100755
--- a/tests/remake9b.test
+++ b/tests/remake9b.test
@@ -17,9 +17,14 @@
# Test remake rules when Makefile.am or its prerequisites change.
# Keep in sync with the other sister tests `remake9*.test'.
-required=GNUmake
. ./defs || Exit 1
+if using_gmake; then
+ remake_() { $MAKE nil; }
+else
+ remake_() { $MAKE Makefile && $MAKE foo.sh; }
+fi
+
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
@@ -75,7 +80,7 @@ for vpath in : false; do
$sleep
sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = $magic1/" $srcdir/Makefile.am >t
mv -f t $srcdir/Makefile.am
- $MAKE nil
+ remake_
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile
test x"`./foo.sh`" = x"$magic1"
@@ -83,7 +88,7 @@ for vpath in : false; do
$sleep
echo 'sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = '$magic2'/"' \
> $srcdir/tweak-makefile-am
- $MAKE nil
+ remake_
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile && Exit 1
$FGREP $magic2 Makefile
@@ -93,6 +98,7 @@ for vpath in : false; do
echo cat > $srcdir/tweak-makefile-am # no-op again
sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = DummyValue/" $srcdir/Makefile.am >t
mv -f t $srcdir/Makefile.am
+ using_gmake || remake_
$MAKE distcheck
$FGREP $magic1 Makefile && Exit 1 # sanity check
$FGREP $magic2 Makefile && Exit 1 # likewise
diff --git a/tests/remake9c.test b/tests/remake9c.test
index 3328beb..6186bfb 100755
--- a/tests/remake9c.test
+++ b/tests/remake9c.test
@@ -17,12 +17,17 @@
# Test remake rules when acinclude.m4 or its prerequisites change.
# Keep in sync with the other sister tests `remake9*.test'.
-required=GNUmake
. ./defs || Exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
+if using_gmake; then
+ remake_() { $MAKE nil; }
+else
+ remake_() { $MAKE Makefile && $MAKE foo.sh; }
+fi
+
cat >> configure.in <<END
FINGERPRINT='my_fingerprint'
AC_SUBST([FINGERPRINT])
@@ -77,7 +82,7 @@ for vpath in : false; do
$sleep
echo "AC_DEFUN([my_fingerprint], [$magic1])" > $srcdir/acinclude.m4
- $MAKE nil
+ remake_
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile
test x"`./foo.sh`" = x"$magic1"
@@ -85,7 +90,7 @@ for vpath in : false; do
$sleep
echo "echo 'AC_DEFUN([my_fingerprint], [$magic2])'" \
> $srcdir/tweak-acinclude-m4
- $MAKE nil
+ remake_
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile && Exit 1
$FGREP $magic2 Makefile
@@ -94,6 +99,7 @@ for vpath in : false; do
$sleep
echo : > $srcdir/tweak-acinclude-m4 # no-op again
echo "AC_DEFUN([my_fingerprint], [DummyValue])" > $srcdir/acinclude.m4
+ using_gmake || remake_
$MAKE distcheck
$FGREP $magic1 Makefile && Exit 1 # sanity check
$FGREP $magic2 Makefile && Exit 1 # likewise
diff --git a/tests/remake9d.test b/tests/remake9d.test
index ecb93d9..b18db2a 100755
--- a/tests/remake9d.test
+++ b/tests/remake9d.test
@@ -17,12 +17,17 @@
# Test remake rules when aclocal.m4 or its prerequisites change.
# Keep in sync with the other sister tests `remake9*.test'.
-required=GNUmake
. ./defs || Exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
+if using_gmake; then
+ remake_() { $MAKE nil; }
+else
+ remake_() { $MAKE Makefile && $MAKE foo.sh; }
+fi
+
cat >> configure.in <<END
FINGERPRINT='my_fingerprint'
AC_SUBST([FINGERPRINT])
@@ -77,7 +82,7 @@ for vpath in : false; do
$sleep
echo "AC_DEFUN([my_fingerprint], [$magic1])dnl %%%" >> $srcdir/aclocal.m4
- $MAKE nil
+ remake_
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile
test x"`./foo.sh`" = x"$magic1"
@@ -85,7 +90,7 @@ for vpath in : false; do
$sleep
echo "sed 's/.*dnl *%%%.*/AC_DEFUN([my_fingerprint], [$magic2])/'" \
> $srcdir/tweak-aclocal-m4
- $MAKE nil
+ remake_
$FGREP FINGERPRINT Makefile # for debugging
$FGREP $magic1 Makefile && Exit 1
$FGREP $magic2 Makefile
@@ -94,6 +99,7 @@ for vpath in : false; do
$sleep
echo cat > $srcdir/tweak-aclocal-m4 # no-op again
echo 'AC_DEFUN([my_fingerprint], [DummyValue])' >> $srcdir/aclocal.m4
+ using_gmake || remake_
$MAKE distcheck
$FGREP $magic1 Makefile && Exit 1 # sanity check
$FGREP $magic2 Makefile && Exit 1 # likewise
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-813-gcbfbccc,
Stefano Lattarini <=