[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-917-g6b3aabe

[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=6b3aabe1ad4acfb83ad68d9768a5e7523886fd37

The branch, master has been updated
       via  6b3aabe1ad4acfb83ad68d9768a5e7523886fd37 (commit)
       via  40ef9a0b95e9f15eb53f21db2e07f82342beaad9 (commit)
       via  3680f7deb922ec3128eb1a69788392984b856860 (commit)
       via  b6a40fa2d2c08f71f9aeced063a36a27f657da6b (commit)
      from  4e0ccf0f434fc0e83d2dd46d2d14791ee86df06b (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                       |   20 ++++++++++++++++++++
 tests/amhello-binpkg.test       |   13 ++++++++++---
 tests/defs                      |    2 +-
 tests/self-check-is_newest.test |   33 +++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5fd899..4e7e08a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2011-07-23  Stefano Lattarini  <address@hidden>
+
+       tests: relax a test on amhello examples to cater to Solaris tar
+       * tests/amhello-binpkg.test: When the tar implementation in use
+       is not GNU tar, relax the tests on tar output, to avoid spurious
+       failures.  For example, "tar cvf ..." with GNU tar can output
+       lines like "./usr/bin/hello" on the standard output, while with
+       Solaris tar it can output lines like "a ./usr/bin/hello 8K" on
+       standard output, and with Heirloom tar it can output lines like
+       "a ./usr/bin/hello 15 tape blocks" on standard error.
+
+2011-07-23  Stefano Lattarini  <address@hidden>
+
+       test defs: function 'is_newest' now works also with directories
+       * tests/defs (is_newest): Call `find' with the `-prune' option,
+       so that it won't descend in the directories (which could cause
+       spurious results).
+       * tests/self-check-is_newest: Extend accordingly.
+       From a report by Jim Meyering, see automake bug#9147.
+
 2011-07-15  Benoit Sigoure  <address@hidden>
 
        docs: add references between the 2 sections on java support
diff --git a/tests/amhello-binpkg.test b/tests/amhello-binpkg.test
index 34600fe..34dc519 100755
--- a/tests/amhello-binpkg.test
+++ b/tests/amhello-binpkg.test
@@ -32,12 +32,19 @@ make
 make DESTDIR="`pwd`/inst" install
 cd inst
 find . -type f -print > ../files.lst
-tar cvf amhello-1.0-i686.tar.gz `cat ../files.lst` > t
-LC_ALL=C sort t > tar.got
+tar cvf amhello-1.0-i686.tar.gz `cat ../files.lst` > tar.got 2>&1
 
-diff - tar.got <<'END'
+if tar --version </dev/null | grep GNU; then
+  LC_ALL=C sort tar.got > t
+  mv -f t tar.got
+  diff - tar.got <<'END'
 ./usr/bin/hello
 ./usr/share/doc/amhello/README
 END
+else
+  : Be laxer with other tar implementations, to avoid spurious failures.
+  $EGREP '(^| )\./usr/bin/hello( |$)' tar.got
+  $EGREP '(^| )\./usr/share/doc/amhello/README( |$)' tar.got
+fi
 
 :
diff --git a/tests/defs b/tests/defs
index fb0b535..dc7add0 100644
--- a/tests/defs
+++ b/tests/defs
@@ -147,7 +147,7 @@ cross_compiling ()
 # Resolve ties in favor of FILE.
 is_newest ()
 {
-  is_newest_files=`find "$@" -newer "$1"`
+  is_newest_files=`find "$@" -prune -newer "$1"`
   test -z "$is_newest_files"
 }
 
diff --git a/tests/self-check-is_newest.test b/tests/self-check-is_newest.test
index f179229..832d352 100755
--- a/tests/self-check-is_newest.test
+++ b/tests/self-check-is_newest.test
@@ -39,4 +39,37 @@ stat c d || : # for debugging
 
 is_newest c d
 
+# Should work on directories too, both empty and not-empty.  An older
+# implementation of `is_newest' failed if the first argument was a
+# directory containing files newer than itself (see automake bug#9147).
+mkdir u x
+touch x/foo
+$sleep
+touch x/foo
+$sleep
+mkdir v y
+touch y/foo
+$sleep
+touch y/foo
+
+stat u v x y x/foo y/foo || : # For debugging.
+
+for older in u x; do
+  for newer in v y; do
+    is_newest $newer $older
+    is_newest $older $newer && Exit 1
+  done
+done
+
+is_newest x/foo x
+is_newest x x/foo && Exit 1
+
+touch -r x u
+is_newest x u
+is_newest u x
+
+# A couple of mild "stress" tests.
+is_newest y x u v
+is_newest y u x/foo a b c
+
 :


hooks/post-receive
-- 
GNU Automake