diff options
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-10-02 19:58:39 +0200 |
---|---|---|
committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-10-02 19:58:39 +0200 |
commit | 973c5463aa0f8f1eb27cfdb0f358989b704618bb (patch) | |
tree | 7bd25265493e72bae11167be910b821e511f3475 | |
parent | 333c18a898e9042938be0e5709ec46ff0ead0797 (diff) | |
download | automake-973c5463aa0f8f1eb27cfdb0f358989b704618bb.tar.gz |
tests: avoid running into timing issues due to sanity change.
* tests/acloca10.test, tests/acloca18.test, tests/aclocal9.test:
Insert strategic sleep before aclocal reruns, to ensure files
are newer.
* tests/python11.test: Use --force for repeated autotools runs.
Reports from the NixOS Hydra build daemon via Ludovic Courtès.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
-rw-r--r-- | ChangeLog | 7 | ||||
-rwxr-xr-x | tests/acloca10.test | 5 | ||||
-rwxr-xr-x | tests/acloca18.test | 8 | ||||
-rwxr-xr-x | tests/aclocal9.test | 4 | ||||
-rwxr-xr-x | tests/python11.test | 6 |
5 files changed, 24 insertions, 6 deletions
@@ -1,5 +1,12 @@ 2010-10-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + tests: avoid running into timing issues due to sanity change. + * tests/acloca10.test, tests/acloca18.test, tests/aclocal9.test: + Insert strategic sleep before aclocal reruns, to ensure files + are newer. + * tests/python11.test: Use --force for repeated autotools runs. + Reports from the NixOS Hydra build daemon via Ludovic Courtès. + Fix timestamp issues by ensuring configure takes at least a second. * m4/sanity.m4 (AM_SANITY_CHECK): If we didn't sleep here, start a sleep in the background and wait for it to finish diff --git a/tests/acloca10.test b/tests/acloca10.test index 7716f2aa8..c89e80cc8 100755 --- a/tests/acloca10.test +++ b/tests/acloca10.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2005, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -55,6 +55,7 @@ grep MACRO3 aclocal.m4 test ! -f m4_1/macro.m4 test ! -f m4_2/macro.m4 +$sleep $ACLOCAL -I m4_2 -I m4_1 $AUTOCONF ./configure @@ -65,6 +66,7 @@ grep MACRO3 aclocal.m4 test ! -f m4_1/macro.m4 test ! -f m4_2/macro.m4 +$sleep ACLOCAL_TESTSUITE_FLAGS='-I m4_1 -I m4_2' $ACLOCAL --install $AUTOCONF @@ -77,6 +79,7 @@ test -f m4_1/macro.m4 test ! -f m4_2/macro.m4 cp aclocal.m4 copy.m4 +$sleep echo '#GREPME' >>dirlist-test/macro.m4 $ACLOCAL --install $AUTOCONF diff --git a/tests/acloca18.test b/tests/acloca18.test index 22feb2305..4acf06384 100755 --- a/tests/acloca18.test +++ b/tests/acloca18.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2008, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -62,6 +62,7 @@ $AUTOCONF grep macro11 foo grep macro21 foo +$sleep rm -f foo $ACLOCAL --install $AUTOCONF @@ -69,6 +70,7 @@ $AUTOCONF grep macro12 foo grep macro23 foo +$sleep ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2 -I 3' rm -f foo $ACLOCAL --install --dry-run @@ -77,6 +79,7 @@ $AUTOCONF grep macro12 foo grep macro23 foo +$sleep rm -f foo $ACLOCAL --install $AUTOCONF @@ -84,11 +87,13 @@ $AUTOCONF grep macro14 foo grep macro23 foo +$sleep ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2' rm -f foo $ACLOCAL --install 2>stderr && { cat stderr >&2; Exit 1; } grep AM_MACRO2 stderr +$sleep ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1' rm -f foo $ACLOCAL --install @@ -98,6 +103,7 @@ grep macro14 foo grep macro21 foo +$sleep mkdir dirlist-test cat >dirlist-test/m1.m4 <<EOF #serial 456 diff --git a/tests/aclocal9.test b/tests/aclocal9.test index 325f6ae46..a9657fc11 100755 --- a/tests/aclocal9.test +++ b/tests/aclocal9.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 2003, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,6 +42,8 @@ $AUTOCONF grep macro11 foo grep macro21 foo +$sleep + $ACLOCAL -I m4_2 -I m4_1 $AUTOCONF ./configure diff --git a/tests/python11.test b/tests/python11.test index 0f15f375f..9163aac8a 100755 --- a/tests/python11.test +++ b/tests/python11.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004, 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2006, 2008, 2010 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,8 +44,8 @@ grep 'no suitable Python interpreter found' stderr sed 's/AM_PATH_PYTHON/AM_PATH_PYTHON(,,:)/' configure.in >configure.int mv -f configure.int configure.in -$ACLOCAL -$AUTOCONF +$ACLOCAL --force +$AUTOCONF --force # This one should define PYTHON as : and exit succesfully ./configure |