Fix test failure when a shell uses $TMPDIR for here-documents.

* tests/tools.at (autotools and whitespace in file names): Create
$TMPDIR before potential use like in other whitespace tests.

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 70432f8a7a506303070cd3878c3353c70b667402..ec631ffb1059f4d74c38462ec94e4c538e9f0a60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-21  Dmitry V. Levin <ldv@altlinux.org>
+
+       Fix test failure when a shell uses $TMPDIR for here-documents.
+       * tests/tools.at (autotools and whitespace in file names): Create
+       $TMPDIR before potential use like in other whitespace tests.
+
 2010-01-20  Paolo Bonzini  <bonzini@gnu.org>
 
        Add recommendation on (not) unsetting IFS.

diff --git a/tests/tools.at b/tests/tools.at
index cea3a0fa6cbf2f63139f133e4f0520faaab4a60f..d8ac0dc5218cbbcdefbd3f922b786d8b62a7bbd3 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -1283,7 +1283,7 @@ export x
 rm -f a b
 for funny in \
   'with  funny '\'' $x & #! name ' \
-  'with  funny \ '\'' \'\'' " <a >b * ? name '
+  'with  funny \ '\'' \'\'' " <a >b * ? name ' #"
 do
   funny=`func_sanitize_file_name "$funny"`
   file=" file $funny"
@@ -1291,6 +1291,9 @@ do
   TMPDIR=" tmp$dir"
   export TMPDIR
 
+  # skip if we cannot create such a file or directory
+  AT_CHECK([mkdir "$dir" "$TMPDIR" && touch "$file.in" || exit 77])
+
   cat >"$file.in" <<'END'
 [AC_INIT(x,0)
 m4@&t@_include([foo.m4])
@@ -1298,8 +1301,6 @@ AC_CONFIG_HEADERS([config.h:config.hin])
 AC_MACRO
 AC_OUTPUT]
 END
-  # skip if we cannot create such a file or directory
-  AT_CHECK([mkdir "$dir" "$TMPDIR" && test -f "$file.in" || exit 77])
   cat >"$dir"/foo.m4 <<'END'
 [AC_DEFUN([AC_MACRO], [echo hi])]
 END