Fix some whitespace tests on cygwin.

* tests/tools.at (autom4te and whitespace in file names): Restore
font-lock.  Create $TMPDIR before it might be used.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index bcf598a5f7d213684a52b9c3f2f31587a2c361b7..47cdf2ebe15d82ae6a33cc3c551611dc12f8c5bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-12  Eric Blake  <ebb9@byu.net>
 
+       Fix some whitespace tests on cygwin.
+       * tests/tools.at (autom4te and whitespace in file names): Restore
+       font-lock.  Create $TMPDIR before it might be used.
+
        Fix spurious testsuite failure with M4 1.4.11.
        * tests/local.at (AT_CHECK_M4): Cater to new m4 error message.
 

diff --git a/tests/tools.at b/tests/tools.at
index 8c0794f42e1138002b8584a26434307003c3ea76..e5f9ae8faee5b0c3175373501824adc98ca710d5 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -146,10 +146,11 @@ AT_SETUP([autom4te and whitespace in file names])
 x=
 export x
 rm -f a b
-# the first one omits special characters that are not w32 safe.
+# the first one omits special characters and trailing spaces,
+# which are not w32 safe.
 for funny in \
-  'with  funny '\'' $x & #! name ' \
-  'with  funny \ '\'' \'\'' " <a >b * ? name '
+  'with  funny '\'' $x & #! name' \
+  'with  funny \ '\'' \'\'' " <a >b * ? name ' # "restore font-lock
 do
   file=" file $funny"
   outfile="$file out "
@@ -158,13 +159,14 @@ do
   TMPDIR=" tmp$dir"
   export TMPDIR
 
+  # skip if we cannot create such a file or directory
+  AT_CHECK([mkdir "$dir" "$cachedir" "$TMPDIR" && touch "$file" || exit 77])
+
   cat >"$file" <<'END'
 [m4@&t@_include(foo.m4)
 m4@&t@_divert(0)d@&t@nl
 FOO]
 END
-  # skip if we cannot create such a file or directory
-  AT_CHECK([mkdir "$dir" "$cachedir" "$TMPDIR" && test -f "$file" || exit 77])
   cat >"$dir"/foo.m4 <<'END'
 [m4@&t@_define([FOO], [bar])]
 END