rebase: fix sources and commit the testsuite patch

Related: #1159497
Version: 2.4.4-1
This commit is contained in:
Pavel Raiskup 2015-01-14 11:39:59 +01:00
parent 6f9ef243b6
commit 814b78bc80
3 changed files with 35 additions and 2 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/libtool-2.4.3.tar.xz
/libtool-2.4.4.tar.xz

View File

@ -0,0 +1,33 @@
From 2ad0598f0d8cd8c8532a2c34ea1b06c71901047d Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Mon, 15 Dec 2014 13:42:25 +0100
Subject: [PATCH] tests: fix race in aclocal/autoheader calls
Put the sleep 1 after aclocal run, same as autoreconf does. This
guarantees that 'aclocal.m4' will have smaller timestamp than
'config.h.in' and avoids re-running autoheader later on.
* tests/testsuite.at (LT_AT_ACLOCAL): Sleep sec after aclocal run.
---
tests/testsuite.at | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 76ed722..2a359a3 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -123,6 +123,11 @@ AT_DATA([acinclude.m4],
[m4_define([AC_CONFIG_MACRO_DIRS], m4_defn([AC_CONFIG_MACRO_DIR]))])
]])
LT_AT_CHECK([$ACLOCAL $1$macro_dir], [0], [ignore], [ignore])
+# After the 'aclocal' run sleep 1 second to guarantee that aclocal.m4 is going
+# to have older timestamp than other autotools later-generated files (concretely
+# for libtool case, we speak about config.h.in generated autoheader).
+# Autoreconf does the same (after the first aclocal run).
+sleep 1
AT_XFAIL_IF([test no = "$ACLOCAL"])
AT_KEYWORDS([automake])
])
--
1.9.3

View File

@ -1 +1 @@
b5699a6d58f5594cdb0992c5e1f5e57e libtool-2.4.3.tar.xz
51bf400de3354687d68dfa2392506b7e libtool-2.4.4.tar.xz