* tests/am-subdir.at, tests/early-libtool.at: Fix the LF vs.

CRLF related failures on MinGW by grepping for good output
instead of using AT_CHECK's `expout'.

diff --git a/ChangeLog b/ChangeLog
index 8f34d161356eff1cdd549a9f4a6137e481366e51..194422d84450d5463aeee199e6f609944e890fe6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * tests/am-subdir.at, tests/early-libtool.at: Fix the LF vs.
+       CRLF related failures on MinGW by grepping for good output
+       instead of using AT_CHECK's `expout'.
+
 2006-09-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Drop K&R support from testsuite in favor of C89.

diff --git a/tests/am-subdir.at b/tests/am-subdir.at
index 7cc47d2506556bf1d3d1c4d8905ef3b7a0f33923..409f3c0ebc443d9ae97f8610f11b1e2604b89be9 100644 (file)
--- a/tests/am-subdir.at
+++ b/tests/am-subdir.at
@@ -69,14 +69,13 @@ AT_DATA([[subdir/sub.c]],
 void sub (void) { printf ("** This is libsub **\n"); }
 ]])
 
-AT_DATA(expout,
-[[Welcome to GNU Libtool subdir-objects test!
-** This is libsub **
-]])
-
 LT_AT_BOOTSTRAP([--copy], [-I m4], [ignore], [--add-missing])
 
-LT_AT_EXEC_CHECK([subdir/subdemo], 0, expout)
+LT_AT_EXEC_CHECK([subdir/subdemo], 0, stdout)
+AT_CHECK([grep 'Welcome to GNU Libtool subdir-objects test' stdout],
+        [], [ignore])
+AT_CHECK([grep 'This is libsub' stdout],
+        [], [ignore])
 
 AT_CLEANUP
 

diff --git a/tests/early-libtool.at b/tests/early-libtool.at
index 66160aecd99e1e2b58bd553d8136cd573d29c0e7..14e4b16084f60e0cee004f0118bd8ed5358c0229 100644 (file)
--- a/tests/early-libtool.at
+++ b/tests/early-libtool.at
@@ -94,11 +94,6 @@ main (int argc, char *argv[])
 }
 ]])
 
-AT_DATA(expout,
-[[Welcome to GNU Hell!
-** This is not GNU Hello.  There is no built-in mail reader. **
-]])
-
 cat > missing <<_EOF
 #! /bin/sh
 exit 0
@@ -111,7 +106,10 @@ LT_AT_AUTOCONF([--force])
 LT_AT_CONFIGURE
 LT_AT_MAKE
 
-LT_AT_EXEC_CHECK([./hell], [0], [expout])
+LT_AT_EXEC_CHECK([./hell], [0], [stdout])
+AT_CHECK([grep 'Welcome to GNU Hell' stdout], [], [ignore])
+AT_CHECK([grep 'This is not GNU Hello.' stdout],
+        [], [ignore])
 
 AT_CLEANUP
 
@@ -201,11 +199,6 @@ main (int argc, char *argv[])
 }
 ]])
 
-AT_DATA(expout,
-[[Welcome to GNU Hell!
-** This is not GNU Hello.  There is no built-in mail reader. **
-]])
-
 cat > missing <<_EOF
 #! /bin/sh
 exit 0
@@ -218,6 +211,8 @@ LT_AT_AUTOCONF([--force])
 LT_AT_CONFIGURE
 LT_AT_MAKE
 
-LT_AT_EXEC_CHECK([./hell], [0], [expout])
+LT_AT_EXEC_CHECK([./hell], [0], [stdout])
+AT_CHECK([grep 'Welcome to GNU Hell' stdout], [], [ignore])
+AT_CHECK([grep 'This is not GNU Hello.' stdout], [], [ignore])
 
 AT_CLEANUP