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

Fix test failures on mingw.
---

diff --git a/ChangeLog b/ChangeLog
index 32fdae9c3..0fa1a4e19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-04-21  Bruno Haible  <bruno@clisp.org>
 
+	Fix test failures on mingw.
+	* tests/test-xstrtol.c (print_no_progname): New function.
+	(main): Install it in error_print_progname hook.
+	* tests/test-xstrtol.sh: Convert CR/LF to NL in output.
+	* tests/test-xstrtoimax.sh: Likewise.
+	* tests/test-xstrtoumax.sh: Likewise.
+
+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.
 
diff --git a/tests/test-xstrtoimax.sh b/tests/test-xstrtoimax.sh
index 7925170d2..14cb9e07e 100755
--- a/tests/test-xstrtoimax.sh
+++ b/tests/test-xstrtoimax.sh
@@ -20,7 +20,7 @@ result=0
 ./test-xstrtoimax${EXEEXT} MiB >> t-xstrtoimax.tmp 2>&1 || result=1
 
 # normalize output
-sed -e 's/^[^:]*: //' < t-xstrtoimax.tmp > t-xstrtoimax.xo
+LC_ALL=C tr -d '\r' < t-xstrtoimax.tmp > t-xstrtoimax.xo
 mv t-xstrtoimax.xo t-xstrtoimax.tmp
 
 # compare expected output
diff --git a/tests/test-xstrtol.c b/tests/test-xstrtol.c
index fa9cf72a4..6aa5e895c 100644
--- a/tests/test-xstrtol.c
+++ b/tests/test-xstrtol.c
@@ -1,6 +1,6 @@
 /* Test of xstrtol module.
    Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-   2006, 2007 Free Software Foundation, Inc.
+   2006, 2007, 2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,6 +32,12 @@
 
 char *program_name;
 
+/* Don't show the program name in error messages.  */
+static void
+print_no_progname (void)
+{
+}
+
 int
 main (int argc, char **argv)
 {
@@ -39,6 +45,8 @@ main (int argc, char **argv)
   int i;
 
   program_name = argv[0];
+  error_print_progname = print_no_progname;
+
   for (i = 1; i < argc; i++)
     {
       char *p;
diff --git a/tests/test-xstrtol.sh b/tests/test-xstrtol.sh
index 70022236a..4c65122bc 100755
--- a/tests/test-xstrtol.sh
+++ b/tests/test-xstrtol.sh
@@ -32,7 +32,7 @@ result=0
 ./test-xstrtoul${EXEEXT} MiB >> t-xstrtol.tmp 2>&1 || result=1
 
 # normalize output
-sed -e 's/^[^:]*: //' < t-xstrtol.tmp > t-xstrtol.xo
+LC_ALL=C tr -d '\r' < t-xstrtol.tmp > t-xstrtol.xo
 mv t-xstrtol.xo t-xstrtol.tmp
 
 # compare expected output
diff --git a/tests/test-xstrtoumax.sh b/tests/test-xstrtoumax.sh
index f37dd9ae6..c86c9fbfc 100755
--- a/tests/test-xstrtoumax.sh
+++ b/tests/test-xstrtoumax.sh
@@ -20,7 +20,7 @@ result=0
 ./test-xstrtoumax${EXEEXT} MiB >> t-xstrtoumax.tmp 2>&1 || result=1
 
 # normalize output
-sed -e 's/^[^:]*: //' < t-xstrtoumax.tmp > t-xstrtoumax.xo
+LC_ALL=C tr -d '\r' < t-xstrtoumax.tmp > t-xstrtoumax.xo
 mv t-xstrtoumax.xo t-xstrtoumax.tmp
 
 # compare expected output