testsuite: minor w32 fixes.

* tests/depend5.test: Don't fail if the system or file system
cannot handle weird characters, instead just try a few.
* tests/parallel-tests3.test: Really wait until the serial test
has finished, before letting the cleanup trap do its work.
Report by Bruno Haible.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 0e7f941c4f044a9daae88e274623c34901daeb9f..4868fca1a8cfb94891d1e94eab6c929c9cf912d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-04-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       testsuite: minor w32 fixes.
+       * tests/depend5.test: Don't fail if the system or file system
+       cannot handle weird characters, instead just try a few.
+       * tests/parallel-tests3.test: Really wait until the serial test
+       has finished, before letting the cleanup trap do its work.
+       Report by Bruno Haible.
+
        Avoid nonportable `./FILE' instead of `FILE' in test.
        * tests/libtool3.test: Do not use `$(top_builddir)/sub/libname.la'
        in *_LDADD entry if `$(top_builddir)' is `.'.  Fixes test failure

diff --git a/tests/depend5.test b/tests/depend5.test
index 5644933b79c30de8f39947bba3ea6057e6fa484d..a34e765911b1d1ab654a8ab9093652b40d173c9a 100755 (executable)
--- a/tests/depend5.test
+++ b/tests/depend5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009  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
@@ -51,15 +51,22 @@ fi
 # For the fun of it, we should also cope with makefile
 # names that contain weird characters, with Autoconf 2.62
 # and newer.
-name='weird  name with $ `#() &! characters"'
-cp Makefile.in "$name.in"
+# Pick the first name that the file system will accept.
+for name in \
+  'weird  name with $ `#() &! characters"' \
+  'weird  name with $ `#()  characters"' \
+  'weird  name with  characters'
+do
+  cp Makefile.in "$name.in" && break || :
+done
 
 for arg in Makefile \
   --file=Makefile \
   "--file=$name"
 do
   rm -rf .deps _deps
-  ./config.status "$arg" depfiles >stdout 2>stderr
+  ./config.status "$arg" depfiles >stdout 2>stderr ||
+    { cat stdout; cat stderr >&2; Exit 1; }
   cat stdout
   cat stderr >&2
   grep '[Nn]o such file' stderr && Exit 1

diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
index 776000e93e1e1489deacd2a1ab1b00a693f47478..8d3cda0bd4fd4b234dd68b0e0cc0cc1476f02c2a 100755 (executable)
--- a/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@ -77,8 +77,9 @@ test `grep -c PASS parallel/stdout` -eq 8
 
 # Wait long enough so that there are no open files any more
 # when the post-test cleanup runs.
-$sleep
-$sleep
-$sleep
+while test ! -f serial/test-suite.log
+do
+  $sleep
+done
 $sleep
 :