diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | m4/depend.m4 | 5 | ||||
| -rwxr-xr-x | tests/parallel-tests-unreadable-log.test | 1 | ||||
| -rwxr-xr-x | tests/spy.test | 14 |
4 files changed, 37 insertions, 4 deletions
@@ -1,3 +1,24 @@ +2011-01-19 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + Allow _AM_DEPENDENCIES to be used later in configure. + * m4/depend.m4 (_AM_DEPENDENCIES): Remove a previously existing + conftest.dir before recreating it. + Fixes bug#7864. + Report by Eric Blake, from report by Scott McCreary against M4. + +2011-01-18 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + tests: avoid failure on w32 file systems. + * tests/parallel-tests-unreadable-log.test: SKIP if file cannot + be turned unreadable. + +2011-01-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + tests: allow double-colon spy.test to work with HP-UX make. + * tests/spy.test: Fix comment typos. Ensure prerequisites we + do not want to depend on are strictly older than the target. + Also test with a target out of date wrt. more than one rule. + 2011-01-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Avoid local $_ perl variable, for Perl before 5.9.1. diff --git a/m4/depend.m4 b/m4/depend.m4 index 714bc9c9b..a5726c646 100644 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@ -1,12 +1,12 @@ ## -*- Autoconf -*- # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010 Free Software Foundation, Inc. +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -46,6 +46,7 @@ AC_CACHE_CHECK([dependency style of $depcc], # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. diff --git a/tests/parallel-tests-unreadable-log.test b/tests/parallel-tests-unreadable-log.test index 6ebb2b62d..572f03df5 100755 --- a/tests/parallel-tests-unreadable-log.test +++ b/tests/parallel-tests-unreadable-log.test @@ -51,6 +51,7 @@ line=PASS; export line $MAKE foo.log $MAKE bar.log chmod a-r foo.log bar.log +test ! -r foo.log || Exit 77 $MAKE test-suite.log >stdout && { cat stdout; Exit 1; } cat stdout grep '^2 of 2 tests failed *$' stdout diff --git a/tests/spy.test b/tests/spy.test index 79673d584..f4bd6efbb 100755 --- a/tests/spy.test +++ b/tests/spy.test @@ -16,8 +16,8 @@ # Check whether double colon rules work. The Unix V7 make manual # mentions double-colon rules, but POSIX does not. They seem to be -# supported by all Make implementation as we can tell. This test case -# is a spy: we want to detect if there exist implementations where +# supported by all Make implementation as far as we can tell. This test +# case is a spy: we want to detect if there exist implementations where # these do not work. We might use these rules to simplify the rebuild # rules (instead of the $? hack). @@ -85,8 +85,18 @@ $sleep touch b $MAKE test "`cat a`" = rule1 +# Ensure a is strictly newer than b, so HP-UX make does not execute rule2. +$sleep : > a $sleep touch c $MAKE test "`cat a`" = rule2 +: > a +$sleep +touch b c +$MAKE +grep rule1 a +grep rule2 a + +: |