Fix test failure on mingw.

diff --git a/ChangeLog b/ChangeLog
index 7b5dc0e6955b081c116c6b4ffb232efe4df17398..32fdae9c311506dd16786fa2bc49de7ad450dd6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-21  Bruno Haible  <bruno@clisp.org>
+
+       Fix test failure on mingw.
+       * tests/test-argp-2.sh (func_compare): Remove CRs from sed's output.
+
 2008-04-21  Bruno Haible  <bruno@clisp.org>
 
        * lib/localename.c (SUBLANG_TIBETAN_PRC, SUBLANG_TIBETAN_BHUTAN):

diff --git a/tests/test-argp-2.sh b/tests/test-argp-2.sh
index de4294928f1b591d790af1dbc76ea957ab6d06cd..a5b9d0feeff5d991366a1cf8d809a0b503f1d694 100755 (executable)
--- a/tests/test-argp-2.sh
+++ b/tests/test-argp-2.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for argp.
-# Copyright (C) 2006-2007 Free Software Foundation, Inc.
+# Copyright (C) 2006-2008 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@ func_compare() {
   sed '1{
          s,: [^ ]*/test-argp,: test-argp,
          s,: test-argp\.exe,: test-argp,
-        }' | diff -c $TMP -
+        }' | LC_ALL=C tr -d '\r' | diff -c $TMP -
 }  
 
 ####