# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1208817108 -7200
# Node ID a5ec2702e64a3a00ca3dd3d1127322332032474a
# Parent  148c76830fd285088d59c967916849faf66d2782
Fix test failure on mingw.

diff -r 148c76830fd2 -r a5ec2702e64a ChangeLog
--- a/ChangeLog	Tue Apr 22 00:16:03 2008 +0200
+++ b/ChangeLog	Tue Apr 22 00:31:48 2008 +0200
@@ -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 -r 148c76830fd2 -r a5ec2702e64a tests/test-argp-2.sh
--- a/tests/test-argp-2.sh	Tue Apr 22 00:16:03 2008 +0200
+++ b/tests/test-argp-2.sh	Tue Apr 22 00:31:48 2008 +0200
@@ -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 @@
   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 -
 }  
 
 ####