Re: Unify line endings in localization test

[Peter Rosin]

Den 2009-01-22 21:54 skrev Ralf Wildenhues:
> Hi Peter,
>
> * Peter Rosin wrote on Thu, Jan 22, 2009 at 10:57:20AM CET:
> > > > Something like the attached?
> > > Yes, with nits below addressed.
>
> > Ok, so push to master or pr-msvc-support?
>
> This change is ok for both.  However, let's move away from manual
> addition of the same change to more than one public branch.  How about
> you do either one of these:
>
> 1) create, in your own repository, a new branch pr-tests-newline-fixes
> containing this one patch, then merge this patch into both
> pr-msvc-support and into master, then push the last two (no need to ever
> push pr-tests-newline-fixes),
> 2) add the patch to master and merge master into pr-msvc-support, and
> then push both branches,
> 3) or, if you feel unsure, I can do either of (1) or (2) for you.

I commited the attached using method 1. However I felt I had to base
the new branch on the common ancestor of master and pr-msvc-support
in order to get a clean(er) merge into both branches. Also, I should
perhaps have used a different merge message? I thought it looked ok
in my local repo, but that was only because the temporary branch exists
there, right?

Cheers, and thanks for the hand-holding,
Peter

diff --git a/ChangeLog b/ChangeLog
index 9ba522d..3ac3e4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-22  Peter Rosin  <address@hidden>
+
+       Unify line endings in localization test.
+       * tests/testsuite.at: Update copyright year.
+       (LT_AT_UNIFY_NL): Add macro that unifies line endings on
+       platforms that suffer from such confusion.
+       * tests/localization.at: Use it. Update copyright year. Fixes
+       the test on MSYS/MSVC.
+
 2008-12-19  Akim Demaille  <address@hidden>
 
        Fix copyright notice.
diff --git a/tests/localization.at b/tests/localization.at
index d489fef..92b19ac 100644
--- a/tests/localization.at
+++ b/tests/localization.at
@@ -1,6 +1,6 @@
 # localization.at -- libtool and locales                -*- Autotest -*-
 #
-#   Copyright (C) 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2008
 #
 #   This file is part of GNU Libtool.
@@ -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..56ca3a2 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,6 +1,6 @@
 # Process with autom4te to create an -*- Autotest -*- test suite.
 #
-#   Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software
+#   Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 #   Foundation, Inc.
 #   Written by Gary V. Vaughan, 2004
 #
@@ -204,6 +204,20 @@ case $host_os in mingw*)
 esac])
 
 
+# LT_AT_UNIFY_NL(FILE, [RESULT-FILE])
+# -----------------------------------
+# Ensure (text) FILE has predictable line endings.
+# If RESULT-FILE is given, FILE is left untouched. If not, convert in-place.
+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], [
+  *)
+    cp $1 $2 ;;])
+esac])
+
+
 # LT_AT_EXEC_CHECK(EXECUTABLE, [STATUS = 0], [STDOUT], [STDERR],
 #                 [ARGS-OR-STATUS-ADJUST])
 # --------------------------------------------------------------