* tests/quote.test: Backport fix for spurious failures on Cygwin.

diff --git a/ChangeLog b/ChangeLog
index 517723b9700b63983866090ca73fc2a635840b0d..d5c563c757f8c73e72c3462825c548f752c491cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-02-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * tests/quote.test: Backport fix for spurious failures on Cygwin.
+
        * THANKS: Update.
 
 2005-02-03  Peter O'Gorman  <peter@pogma.com>

diff --git a/tests/quote.test b/tests/quote.test
index 69b8b5e8c16b9a3c8447c907a581783ac2b70ee3..f7b747a5066a99260a1fcaf16cf2fe3e8a0f9714 100755 (executable)
--- a/tests/quote.test
+++ b/tests/quote.test
@@ -95,7 +95,10 @@ for mode in compile link install; do
   # We used to have the contents of $match in the case statement,
   # without an intermediate variable, but it would fail on at least
   # Solaris' and HP-UX's /bin/sh.  Ugh!
-  match="$preargs ${match_preflag}${flag}test "
+  # We must nost attempt to match $preargs in the output, because libtool
+  # may modify them.  For example, on Cygwin, ``libtool --mode=link gcc -o
+  # foo foo.o''  becomes ``gcc -o foo.exe foo.o''.
+  match="${match_preflag}${flag}test "
   case "$result" in
   *"$match"*)
     $echo "= passed: $result"
@@ -110,7 +113,7 @@ for mode in compile link install; do
   for mchar in \\ \" \` \$; do
     $echo "= trying: \\$mchar quoting"
     result=`$libtool -n --mode=$mode $preargs ${preflag}"${flag}${mchar}test${mchar}" $postargs` || status=1
-    match="$preargs ${match_preflag}${flag}\\${mchar}test\\${mchar} "
+    match="${match_preflag}${flag}\\${mchar}test\\${mchar} "
     case "$result" in
     *"$match"*)
       $echo "= passed: $result"
@@ -128,7 +131,7 @@ for mode in compile link install; do
 
     $echo "= trying: \"$mchar\" quoting"
     result=`$libtool -n --mode=$mode $preargs ${preflag}"${flag}${mchar}test${mchar}" $postargs` || status=1
-    match="$preargs ${match_preflag}\"${flag}${mchar}test${mchar}\" "
+    match="${match_preflag}\"${flag}${mchar}test${mchar}\" "
     case "$result" in
     *"$match"*)
       $echo "= passed: $result"