Re: Unify line endings in localization test

[Peter Rosin]

Den 2009-01-19 21:35 skrev Ralf Wildenhues:
> This looks a bit hackish.  We already have a handful of places which we
> fixed up in order to avoid line ending issues.  This one looks hackish
> enough to deserve being wrapped in a macro (in testsuite.at, below
> LT_AT_HOST_DATA?), so that future instances of this issue can easily be
> handled likewise.

Something like the attached?

Cheers,
Peter

2009-01-20  Peter Rosin  <address@hidden>

        Unify line endings in localization test.
        * tests/testsuite.at (LT_AT_UNIFY_NL): Add macro that unifies
        line endings on platforms that suffer from such confusion.
        * tests/localization.at: Use it. Fixes the test on MSYS/MSVC.

diff --git a/tests/localization.at b/tests/localization.at
index d489fef..1a5c774 100644
--- a/tests/localization.at
+++ b/tests/localization.at
@@ -43,13 +43,16 @@ AT_CHECK([$CC $CPPFLAGS $CFLAGS -c b.c || exit 77], [], 
[stdout], [stderr])
 
 # Find out about expected output.
 AT_CHECK([$CC $CPPFLAGS $CFLAGS -c a.c || exit 1], [1], [stdout], [stderr])
-mv -f stdout expected-stdout
-mv -f stderr expected-stderr
+LT_AT_UNIFY_NL([stdout], [expected-stdout])
+LT_AT_UNIFY_NL([stderr], [expected-stderr])
 AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c a.c || 
exit 1],
         [1], [stdout], [stderr])
+LT_AT_UNIFY_NL([stderr])
 AT_CHECK([diff expected-stderr stderr])
 LTBASE=`$ECHO "$LIBTOOL" | sed 's,^.*/,,'`
-AT_CHECK([grep -v "^$LTBASE: compile" stdout | diff expected-stdout -])
+grep -v "^$LTBASE: compile" stdout > libtool-stdout
+LT_AT_UNIFY_NL([libtool-stdout])
+AT_CHECK([diff expected-stdout libtool-stdout])
 
 # check that we get our quoting right.
 LANGUAGE='a; nosuchprogram " '\''  & $x /#+*(){}|,:`\ !%'
diff --git a/tests/testsuite.at b/tests/testsuite.at
index f116a1f..1d7b3ef 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -204,6 +204,19 @@ case $host_os in mingw*)
 esac])
 
 
+# LT_AT_UNIFY_NL(FILE, [RESULT-FILE])
+# --------------------
+# Ensure (text) file has predicable line endings.
+m4_define([LT_AT_UNIFY_NL],
+[case $host_os in
+ mingw*)
+  tr -d '\015' < $1 > m4_ifval([$2], [$2], [$1.t
+  mv -f $1.t $1]) ;; m4_ifval([$2], [
+ *)
+  mv -f $1 $2 ;;])
+esac])
+
+
 # LT_AT_EXEC_CHECK(EXECUTABLE, [STATUS = 0], [STDOUT], [STDERR],
 #                 [ARGS-OR-STATUS-ADJUST])
 # --------------------------------------------------------------