[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-628-g9217054

[Ralf Wildenhues]

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=9217054b5bd016069548688ebce64aa4989a127d

The branch, master has been updated
       via  9217054b5bd016069548688ebce64aa4989a127d (commit)
       via  2f7858071d70af52550fbc3375a7f0eee8a5cfc7 (commit)
       via  6fdad1a63b7c9d47c8d04d563bd19ea1cc2a9ba7 (commit)
       via  51f1b0da3a8d1b976455ca285e03aab7297c7bbe (commit)
       via  c69843e76f44f2ea4e16e5a3f5e81b7ee26705b6 (commit)
      from  c62bac667b522af9bf8b05175278e67e9b073d09 (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 9217054b5bd016069548688ebce64aa4989a127d
Merge: 6fdad1a 2f78580
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 14:35:36 2011 +0100

    Merge branch 'tests-remake-extend'
    
    * tests-remake-extend:
      Fix remake rule induced test failures with HP-UX make.

commit 2f7858071d70af52550fbc3375a7f0eee8a5cfc7
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 14:32:43 2011 +0100

    Fix remake rule induced test failures with HP-UX make.
    
    * tests/remake1a.test: Require GNU make.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 6fdad1a63b7c9d47c8d04d563bd19ea1cc2a9ba7
Merge: c62bac6 51f1b0d
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 14:30:24 2011 +0100

    Merge branch 'tests-colon-extend'
    
    * tests-colon-extend:
      Fix remake rule-induced test failures with HP-UX make.
      tests: fix typos in colon6.test

commit 51f1b0da3a8d1b976455ca285e03aab7297c7bbe
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 14:29:55 2011 +0100

    Fix remake rule-induced test failures with HP-UX make.
    
    * tests/colon6.test: Update timestamp of subdir Makefile, so we
    do not spuriously invoke the nonexistent toplevel am--refresh
    rule.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit c69843e76f44f2ea4e16e5a3f5e81b7ee26705b6
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Jan 15 14:26:01 2011 +0100

    tests: fix typos in colon6.test
    
    * tests/colon6.test: Fix typos.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog           |   15 +++++++++++++++
 tests/colon6.test   |   22 ++++++++++++++--------
 tests/remake1a.test |    1 +
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b70b607..651ba48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
 2011-01-15  Ralf Wildenhues  <address@hidden>
+
+       Fix remake rule-induced test failures with HP-UX make.
+       * tests/remake1a.test: Require GNU make.
+
+2011-01-15  Ralf Wildenhues  <address@hidden>
+
+       Fix remake rule-induced test failures with HP-UX make.
+       * tests/colon6.test: Update timestamp of subdir Makefile, so we
+       do not spuriously invoke the nonexistent toplevel am--refresh
+       rule.
+
+       tests: fix typos in colon6.test
+       * tests/colon6.test: Fix typos.
+
+2011-01-15  Ralf Wildenhues  <address@hidden>
            Stefano Lattarini  <address@hidden>
 
        tests: explain MSYS setup failure issue, improve test.
diff --git a/tests/colon6.test b/tests/colon6.test
index bf5cf2d..9c739b0 100755
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -22,8 +22,8 @@
 cat > configure.in <<END
 AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE
-# With this, version.good should depend from version.gin, while
-# Makefile should not depend from either of them.
+# With this, version.good should depend on version.gin, while
+# Makefile should not depend on either of them.
 AC_CONFIG_FILES([demo/Makefile demo/version.good:demo/version.gin])
 AC_OUTPUT
 END
@@ -35,7 +35,7 @@ mkdir demo
 $ACLOCAL
 $AUTOMAKE
 
-# These are older "grepping check", kept mostly for backward-copmatibility.
+# These are older "grepping checks", kept mostly for backward-compatibility.
 # They might (unlikely, but possibly) require updating when automake
 # internals are changed.  Just relax or remove if they become too fragile.
 $EGREP 'Makefile:.*(demo|version)' demo/Makefile.in && Exit 1
@@ -60,27 +60,33 @@ for vpath in : false; do
 
   cd demo
 
-  # version.good should depend from version.gin
   $sleep
+  # HP-UX make considers targets with exact time stamps as one of their
+  # prerequisites out of date.  Ensure Makefile is newer than config.status to
+  # avoid triggering the am--refresh rule in the (here-nonexistent) toplevel
+  # Makefile.
+  touch Makefile
+
+  # version.good should depend on version.gin.
   echo "Rebuilt (srcdir=$srcdir)" > ../$srcdir/demo/version.gin
   $MAKE version.good
   $FGREP "Rebuilt (srcdir=$srcdir)" version.good
 
-  # Makefile should not depend from version.good.
+  # Makefile should not depend on version.good.
   rm -f version.good
   $MAKE Makefile
   test ! -r version.good
 
-  # version.good should be rebuilt from version.gin
+  # version.good should be rebuilt from version.gin.
   $MAKE version.good
   test -f version.good
 
-  # Makefile should not depend from version.gin.
+  # Makefile should not depend on version.gin.
   rm -f ../$srcdir/demo/version.gin
   $MAKE Makefile
   test ! -r ../$srcdir/demo/version.gin # sanity check
 
-  # version.good should depend from version.gin
+  # version.good should depend on version.gin.
   rm -f version.good
   $MAKE version.good >output 2>&1 && { cat output; Exit 1; }
   cat output
diff --git a/tests/remake1a.test b/tests/remake1a.test
index fc5ba6d..a794a05 100755
--- a/tests/remake1a.test
+++ b/tests/remake1a.test
@@ -17,6 +17,7 @@
 # Make sure remaking rules in subdir are correctly generated.
 # See also sister "grepping" test `remake.test'.
 
+required=GNUmake
 . ./defs || Exit 1
 
 fingerprint='=/FiNgErPrInT/='


hooks/post-receive
-- 
GNU Automake