libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

fix testsuite on MinGW


From: Ralf Wildenhues
Subject: fix testsuite on MinGW
Date: Sun, 3 Sep 2006 17:08:32 +0200
User-agent: Mutt/1.5.13 (2006-08-11)

Applied to HEAD: compiled programs (as opposed to the `echo' shell
builtin; or `cat' of a here-document from a script with LF encoding)
output CRLF in text mode.

There are currently two failures in the new testsuite on w32: static.at
(which relies on `-R dir' to function as advertised) and stresstest.at
(not analyzed yet).

Cheers,
Ralf


        * 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'.

Index: tests/am-subdir.at
===================================================================
RCS file: /sources/libtool/libtool/tests/am-subdir.at,v
retrieving revision 1.12
diff -u -r1.12 am-subdir.at
--- tests/am-subdir.at  16 Dec 2005 15:57:22 -0000      1.12
+++ tests/am-subdir.at  3 Sep 2006 13:46:57 -0000
@@ -69,14 +69,13 @@
 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
 
Index: tests/early-libtool.at
===================================================================
RCS file: /sources/libtool/libtool/tests/early-libtool.at,v
retrieving revision 1.9
diff -u -r1.9 early-libtool.at
--- tests/early-libtool.at      18 May 2006 09:18:09 -0000      1.9
+++ tests/early-libtool.at      3 Sep 2006 13:46:58 -0000
@@ -94,11 +94,6 @@
 }
 ]])
 
-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_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 @@
 }
 ]])
 
-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_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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]