[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-846-g70a9da6

[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=70a9da6a32f9dbb14a7133c341ecc2f1d9b76f59

The branch, testsuite-work has been updated
       via  70a9da6a32f9dbb14a7133c341ecc2f1d9b76f59 (commit)
       via  8e4e230f603e689c2415e1a621eafebb7540c6b2 (commit)
       via  955eccc6c890186b8e94be35911c1dd82da4f6b0 (commit)
       via  dac62e3f0f6a2cfb0e6207dba726a15966523e47 (commit)
       via  d5142f9c881d45e3afbf790b2f9475869fe04b45 (commit)
       via  c92ac83b1329e8e2c24ff25974993cb4d520c2e3 (commit)
      from  7fd7a7d1560a3181a98118d7d8869e8c78ea2e8c (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 70a9da6a32f9dbb14a7133c341ecc2f1d9b76f59
Merge: 7fd7a7d 8e4e230
Author: Stefano Lattarini <address@hidden>
Date:   Sat May 7 15:40:54 2011 +0200

    Merge branch 'master' into testsuite-work
    
    * master:
      tests: fix spurious failure of extradep.test on FreeBSD

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

Summary of changes:
 ChangeLog            |   11 +++++++++++
 tests/extradep.test  |    9 ++++++---
 tests/extradep2.test |    9 ++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5141432..7859a4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2011-05-07  Stefano Lattarini  <address@hidden>
 
+       tests: fix spurious failure of extradep.test on FreeBSD
+       * tests/extradep.test: When using `ls -t' to determine whether a
+       file has been updated, make sure to use as reference a file whose
+       timestamp is expected to be *strictly* older that that of the file
+       being checked.  This is required because at least FreeBSD `ls' do
+       not sort files with the same timestamp in alphabetical order when
+       using the `-t' option.
+       * tests/extradep2.test: Likewise.
+
+2011-05-07  Stefano Lattarini  <address@hidden>
+
        tests: fix spurious failure of txinfo21.test on FreeBSD
        * tests/txinfo21.test: Use the `is_newest' subroutine instead of
        the `ls -t' hack to to determine whether a file has been updated.
diff --git a/tests/extradep.test b/tests/extradep.test
index f17aeba..623d73a 100755
--- a/tests/extradep.test
+++ b/tests/extradep.test
@@ -44,8 +44,10 @@ EXTRA_bar_DEPENDENCIES = $(deps)
 
 EXTRA_DIST = foodep bardep
 
-bar-is-newer-than-libfoo.a:
-       test `ls -1t bar$(EXEEXT) libfoo.a | sed q` = bar$(EXEEXT)
+.PHONY: bar-has-been-updated
+bar-has-been-updated:
+       stat older bar$(EXEEXT) libfoo.a || : For debugging.
+       test `ls -t bar$(EXEEXT) older | sed q` = bar$(EXEEXT)
 END
 
 cat >libfoo.c <<'END'
@@ -92,10 +94,11 @@ $MAKE && Exit 1
 : >bardep
 
 $MAKE
+: > older
 $sleep
 touch libfoo.a
 $MAKE
-$MAKE bar-is-newer-than-libfoo.a
+$MAKE bar-has-been-updated
 
 $MAKE distcheck
 
diff --git a/tests/extradep2.test b/tests/extradep2.test
index ca8cf5f..9a97de4 100755
--- a/tests/extradep2.test
+++ b/tests/extradep2.test
@@ -40,8 +40,10 @@ EXTRA_bar_DEPENDENCIES = $(deps)
 
 EXTRA_DIST = bardep
 
-bar-is-newer-than-libfoo.la:
-       test `ls -1t bar$(EXEEXT) libfoo.la | sed q` = bar$(EXEEXT)
+.PHONY: bar-has-been-updated
+bar-has-been-updated:
+       stat older bar$(EXEEXT) libfoo.la || : For debugging.
+       test `ls -t bar$(EXEEXT) older | sed q` = bar$(EXEEXT)
 END
 
 cat >libfoo.c <<'END'
@@ -74,10 +76,11 @@ $MAKE && Exit 1
 : >bardep
 
 $MAKE
+: > older
 $sleep
 touch libfoo.la
 $MAKE
-$MAKE bar-is-newer-than-libfoo.la
+$MAKE bar-has-been-updated
 
 $MAKE distcheck
 


hooks/post-receive
-- 
GNU Automake