From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 3 Sep 2006 15:08:12 +0000 (+0000)
Subject: * tests/am-subdir.at, tests/early-libtool.at: Fix the LF vs.
X-Git-Tag: release-2-1b~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aabc32cac97b0748ff8ee696e981bcffa854b85;p=thirdparty%2Flibtool.git

* 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 8f34d1613..194422d84 100644
--- 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 7cc47d250..409f3c0eb 100644
--- 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 66160aecd..14e4b1608 100644
--- 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