Generate table with word break data.

[gnulib.git] / tests / test-argp-2.sh

diff --git a/tests/test-argp-2.sh b/tests/test-argp-2.sh
index de42949..93abb52 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,8 +27,8 @@ 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 -
+}
 
 ####
 # Test --usage output
@@ -39,7 +39,7 @@ Usage: test-argp [-tvCSOlp?V] [-f FILE] [-o[ARG]] [--test] [--file=FILE]
             [--version] ARGS...
 EOT
 
-./test-argp --usage | func_compare || ERR=1
+./test-argp$EXEEXT --usage | func_compare || ERR=1
 
 ####
 # Test working usage-indent format
@@ -50,7 +50,7 @@ Usage: test-argp [-tvCSOlp?V] [-f FILE] [-o[ARG]] [--test] [--file=FILE]
 [--limerick] [--poem] [--help] [--usage] [--version] ARGS...
 EOT
 
-ARGP_HELP_FMT='usage-indent=0' ./test-argp --usage | func_compare || ERR=1
+ARGP_HELP_FMT='usage-indent=0' ./test-argp$EXEEXT --usage | func_compare || ERR=1
 
 ####
 # Test --help output
@@ -93,16 +93,18 @@ for any corresponding short options.
 Report bugs to <>.
 EOT
 
-./test-argp --help | func_compare || ERR=1
+# Compare --help output, but filter out any bug-reporting email address.
+./test-argp$EXEEXT --help \
+    | sed 's/^\(Report bugs to \)<[^>]*>.$/\1<>./' | func_compare || ERR=1
 
 ####
 # Test ambiguous option handling
 
-./test-argp --optio 2>/dev/null && ERR=1
+./test-argp$EXEEXT --optio 2>/dev/null && ERR=1
 
 ####
 # Run built-in tests
-./test-argp || ERR=1
+./test-argp$EXEEXT || ERR=1
 
 rm $TMP