From 97c5de22902af85f150ed825b8ce5df94197e9bc Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 22 Apr 2008 00:43:52 +0200 Subject: [PATCH] Fix test failures on mingw. --- ChangeLog | 9 +++++++++ tests/test-xstrtoimax.sh | 2 +- tests/test-xstrtol.c | 10 +++++++++- tests/test-xstrtol.sh | 2 +- tests/test-xstrtoumax.sh | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32fdae9c31..0fa1a4e193 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-04-21 Bruno Haible + + 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 Fix test failure on mingw. diff --git a/tests/test-xstrtoimax.sh b/tests/test-xstrtoimax.sh index 7925170d27..14cb9e07ed 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 fa9cf72a45..6aa5e895cc 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 70022236a0..4c65122bca 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 f37dd9ae61..c86c9fbfca 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 -- 2.30.2