From: Bruno Haible <bruno@clisp.org>
Date: Mon, 21 Apr 2008 22:31:48 +0000 (+0200)
Subject: Fix test failure on mingw.
X-Git-Tag: v0.1~7513
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=fc98966c096e48d67ef6015fb9991538bee75b98;p=gnulib.git

Fix test failure on mingw.
---

diff --git a/ChangeLog b/ChangeLog
index 7b5dc0e69..32fdae9c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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):
 	Actually assign a value.
 
diff --git a/tests/test-argp-2.sh b/tests/test-argp-2.sh
index de4294928..a5b9d0fee 100755
--- 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 -
 }  
 
 ####