From: Peter Rosin Date: Mon, 8 Oct 2012 11:10:02 +0000 (+0200) Subject: tests: rerefix line ending problems on MinGW. X-Git-Tag: v2.4.2.418~137 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f31e375104b00a181557d3809e556066b3d98b1;p=thirdparty%2Flibtool.git 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 --- diff --git a/tests/mdemo.at b/tests/mdemo.at index 48b7f6356..4d7059699 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