summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPeter Rosin <peda@lysator.liu.se>2012-10-08 13:10:02 +0200
committerPeter Rosin <peda@lysator.liu.se>2012-10-08 13:10:02 +0200
commit0f31e375104b00a181557d3809e556066b3d98b1 (patch)
tree711b6d355b06a0c4ac401678a5a3877e1ebdebbd /tests
parentb78fd9740ef6a2ed67a1ef14e76483af784fb5f0 (diff)
downloadlibtool-0f31e375104b00a181557d3809e556066b3d98b1.tar.gz
tests: rerefix line ending problems on MinGW.
The previous commit broke Linux->MinGW cross-compiling. Report by Roumen Petrov. * tests/mdemo.at: Normalize line endings after $EGREP. Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Diffstat (limited to 'tests')
-rw-r--r--tests/mdemo.at12
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/mdemo.at b/tests/mdemo.at
index 48b7f635..4d705969 100644
--- a/tests/mdemo.at
+++ b/tests/mdemo.at
@@ -824,7 +824,8 @@ int main (int argc, char **argv)
}
]])
-# Not using LT_AT_HOST_DATA below, since $EGREP normalizes line endings.
+# Normalize line endings after $EGREP instead of using LT_AT_HOST_DATA
+# here, since $EGREP *may* normalize line endings for us.
AT_DATA([expout],
[[Welcome to GNU libtool mdemo2!
module name: foo1
@@ -849,9 +850,14 @@ LT_AT_CHECK_CONFIG([--with-included-ltdl])
LT_AT_MAKE
-LT_AT_EXEC_CHECK([./mdemo2_static], 0, [expout], [],
+LT_AT_EXEC_CHECK([./mdemo2_static], 0, [stdout], [],
[./foo1.la ./libfoo2.la | $EGREP -v '^module filename: '])
-LT_AT_EXEC_CHECK([./mdemo2], 0, [expout], [],
+LT_AT_UNIFY_NL([stdout])
+LT_AT_CHECK([diff expout stdout])
+
+LT_AT_EXEC_CHECK([./mdemo2], 0, [stdout], [],
[./foo1.la ./libfoo2.la | $EGREP -v '^module filename: '])
+LT_AT_UNIFY_NL([stdout])
+LT_AT_CHECK([diff expout stdout])
AT_CLEANUP