From: Peter Rosin Date: Fri, 5 Oct 2012 19:31:33 +0000 (+0200) Subject: tests: fix line ending problems on MinGW X-Git-Tag: v2.4.2.418~144 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22f5750;p=thirdparty%2Flibtool.git tests: fix line ending problems on MinGW * tests/cdemo.at: Use LT_AT_HOST_DATA for expected output from compiled programs. * tests/demo.at: Likewise. * tests/depdemo.at: Likewise. * tests/f77demo.at: Likewise. * tests/fcdemo.at: Likewise. * tests/mdemo.at: Likewise. * tests/tagdemo.at: Likewise. Signed-off-by: Peter Rosin --- diff --git a/tests/cdemo.at b/tests/cdemo.at index f50106c18..885845c55 100644 --- a/tests/cdemo.at +++ b/tests/cdemo.at @@ -117,7 +117,7 @@ int main () } ]]) -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[Welcome to GNU libtool cdemo! ** This is libfoo ** hello returned: 57616 diff --git a/tests/demo.at b/tests/demo.at index b79564adc..b3d2532ed 100644 --- a/tests/demo.at +++ b/tests/demo.at @@ -339,7 +339,7 @@ int main () } ]]) -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[Welcome to GNU Hell! cos (0.0) = 1 ** This is not GNU Hello. There is no built-in mail reader. ** @@ -901,7 +901,7 @@ int foo2 (void) { } ]]) -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[Welcome to GNU Hell! cos (0.0) = 1 foo2 cos (0.0) = 1 diff --git a/tests/depdemo.at b/tests/depdemo.at index 3c0666b5f..763bae4de 100644 --- a/tests/depdemo.at +++ b/tests/depdemo.at @@ -240,7 +240,7 @@ for i in 1 2 3 4; do done -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[dependencies: l1 (0) l2 (0) diff --git a/tests/f77demo.at b/tests/f77demo.at index 78da9a8d8..5978b3d4a 100644 --- a/tests/f77demo.at +++ b/tests/f77demo.at @@ -249,7 +249,7 @@ m4_define([_LT_CHECK_EXECUTE], # on whether it is redirected to a file or sent to stdout, so we # just check return status, and ignore output. # Advice on this weirdness from a Fortran user much appreciated! -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[ Welcome to GNU libtool Fortran demo! Real programmers write in FORTRAN. fsub called @@ -262,7 +262,7 @@ AT_DATA([expout], ]]) LT_AT_EXEC_CHECK([./fprogram], 0, [ignore]) -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[Welcome to GNU libtool mixed C/Fortran demo! The C subroutine returned, claiming that 2*2 = 4 The C subroutine is ok! @@ -294,7 +294,7 @@ _LT_SETUP LT_AT_CHECK_CONFIG([--disable-shared], [^build_old_libs=yes], [^build_libtool_libs=no]) -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[ Welcome to GNU libtool Fortran demo! Real programmers write in FORTRAN. fsub called diff --git a/tests/fcdemo.at b/tests/fcdemo.at index 3a545eb61..0ade9bbb3 100644 --- a/tests/fcdemo.at +++ b/tests/fcdemo.at @@ -263,7 +263,7 @@ m4_define([_LT_CHECK_EXECUTE], # on whether it is redirected to a file or sent to stdout, so we # just check return status, and ignore output. # Advice on this weirdness from a Fortran user much appreciated! -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[ Welcome to GNU libtool Fortran demo! Real programmers write in FORTRAN. fsub called @@ -276,7 +276,7 @@ AT_DATA([expout], ]]) LT_AT_EXEC_CHECK([./fprogram], 0, [ignore]) -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[Welcome to GNU libtool mixed C/Fortran demo! The C subroutine returned, claiming that 2*2 = 4 The C subroutine is ok! diff --git a/tests/mdemo.at b/tests/mdemo.at index 40f89b472..5fa77f64e 100644 --- a/tests/mdemo.at +++ b/tests/mdemo.at @@ -592,7 +592,7 @@ main (int argc, char **argv) } ]]) -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[Welcome to GNU Hell! cos (0.0) = 1 ** This is not GNU Hello. There is no built-in mail reader. ** @@ -831,7 +831,7 @@ int main (int argc, char **argv) } ]]) -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[Welcome to GNU libtool mdemo2! module name: foo1 module reference count: 1 diff --git a/tests/tagdemo.at b/tests/tagdemo.at index 3909d568b..d54a6122f 100644 --- a/tests/tagdemo.at +++ b/tests/tagdemo.at @@ -315,7 +315,7 @@ AT_DATA([conv.cpp], int convenience (void) { return 1; } ]]) -AT_DATA([expout], +LT_AT_HOST_DATA([expout], [[Welcome to GNU libtool tagdemo C++! ** This is libfoo (tagdemo) ** foobar::hello returned: 57616