[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12-7-ge25a41f

[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=e25a41fac07478d88ad87e96bd254843882ec229

The branch, maint has been updated
       via  e25a41fac07478d88ad87e96bd254843882ec229 (commit)
       via  f31fe4f003b0eb12eb082ae4dca837f36eaac214 (commit)
       via  63e07a9c1297679818e8c584413a2b1df88c834a (commit)
      from  444618b3264dbc1efec2b02f2f3ab6d5e6fb77fe (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 e25a41fac07478d88ad87e96bd254843882ec229
Merge: f31fe4f 63e07a9
Author: Stefano Lattarini <address@hidden>
Date:   Thu Apr 26 12:34:51 2012 +0200

    Merge branch 'fix-pr11346-timestamp' into maint
    
    * fix-pr11346-timestamp:
      tests: fix a spurious failure due to truncated timestamps

commit f31fe4f003b0eb12eb082ae4dca837f36eaac214
Author: Thien-Thi Nguyen <address@hidden>
Date:   Thu Apr 26 12:30:10 2012 +0200

    tests: avoid yet another spurious environment influence
    
    * t/remake11.sh: Unset 'd' before first use.
    
    Copyright-paperwork-exempt: yes
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 63e07a9c1297679818e8c584413a2b1df88c834a
Author: Stefano Lattarini <address@hidden>
Date:   Thu Apr 26 10:52:48 2012 +0200

    tests: fix a spurious failure due to truncated timestamps
    
    Fixes automake bug#11346.
    
    * t/self-check-is_newest.tap: Apparently, on some systems (or file
    systems), "touch -r" can truncate timestamps :-(  Work around that.
    
    Co-authored-by: Peter Breitenlohner <address@hidden>
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 t/remake11.sh              |    1 +
 t/self-check-is_newest.tap |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/t/remake11.sh b/t/remake11.sh
index ec96a08..b88254f 100755
--- a/t/remake11.sh
+++ b/t/remake11.sh
@@ -30,6 +30,7 @@ echo "AC_SUBST([FOO], [$magic1])" >> configure.ac
 
 echo "@FOO@" > bar.in
 echo "AC_CONFIG_FILES([bar])" >> configure.ac
+d=; unset d # Avoid unduly interferences from the environment.
 for i in 0 1 2 3 4 5 6 7 8 9; do
   d=${d+"$d/"}sub$i
   echo "SUBDIRS = sub$i" > Makefile.am
diff --git a/t/self-check-is_newest.tap b/t/self-check-is_newest.tap
index 76b69ac..842c411 100755
--- a/t/self-check-is_newest.tap
+++ b/t/self-check-is_newest.tap
@@ -24,6 +24,16 @@ plan_ 21
 Y () { command_ok_ "is_newest $*" is_newest "$@"; }
 N () { command_ok_ "not is_newest $*" not is_newest "$@"; }
 
+# A simple "touch -r" might not work, since on some file systems, and/or
+# with some 'touch' versions, it might truncate the timestamp (or even
+# rounded it upwards maybe).  So the first (apparently redundant) 'touch'
+# invocation below ensures that the timestamp gets "normalized" in a way
+# that allows it to be correctly copied by the second 'touch' invocation.
+copy_timestamp ()
+{
+  touch -r "$1" "$1" && touch -r "$1" "$2"
+}
+
 : > a
 $sleep
 : > b
@@ -38,7 +48,7 @@ Y c b
 Y c c
 Y c a b c
 
-touch -r c d
+copy_timestamp c d
 
 stat c d || : # For debugging.
 
@@ -69,7 +79,7 @@ done
 Y x/foo x
 N x x/foo
 
-touch -r x u
+copy_timestamp x u
 Y x u
 Y u x
 


hooks/post-receive
-- 
GNU Automake