X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-argp-2.sh;h=31fbb31e3bc2087176569475d32d1276257b6e16;hb=85837d615fc0c092e5ed920e6be187ade121ba39;hp=f5edede781bd48582af3bbd46741b0075d87e4a3;hpb=a7ebfd1caaa58b6a7bc0b1d1510b0255604e804a;p=gnulib.git

diff --git a/tests/test-argp-2.sh b/tests/test-argp-2.sh
index f5edede78..31fbb31e3 100755
--- a/tests/test-argp-2.sh
+++ b/tests/test-argp-2.sh
@@ -23,10 +23,12 @@ unset ARGP_HELP_FMT
 ERR=0
 
 func_compare() {
-# If argp was compiled without base_name, it will display full program name
+# If argp was compiled without base_name, it will display full program name.
+# If run on mingw, it will display the program name with a .exe suffix.
   sed '1{
          s,: [^ ]*/test-argp,: test-argp,
-        }' | diff -pu $TMP -
+         s,: test-argp\.exe,: test-argp,
+        }' | diff -c $TMP -
 }  
 
 ####
@@ -44,9 +46,9 @@ EOT
 # Test working usage-indent format
 
 cat > $TMP <<EOT
-Usage: test-argp [-tvO?V] [-f FILE] [-o[ARG]] [--test] [--file=FILE]
-[--input=FILE] [--verbose] [--option] [--optional[=ARG]] [--help] [--usage]
-[--version] ARGS...
+Usage: test-argp [-tvCSOlp?V] [-f FILE] [-o[ARG]] [--test] [--file=FILE]
+[--input=FILE] [--verbose] [--cantiga] [--sonet] [--option] [--optional[=ARG]]
+[--limerick] [--poem] [--help] [--usage] [--version] ARGS...
 EOT
 
 ARGP_HELP_FMT='usage-indent=0' ./test-argp --usage | func_compare || ERR=1