projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relocatable-shell: Update suggested usage in maintainer documentation.
[gnulib.git]
/
tests
/
test-argp-2.sh
diff --git
a/tests/test-argp-2.sh
b/tests/test-argp-2.sh
index
de42949
..
11a8445
100755
(executable)
--- a/
tests/test-argp-2.sh
+++ b/
tests/test-argp-2.sh
@@
-1,6
+1,6
@@
#! /bin/sh
# Test suite for argp.
#! /bin/sh
# Test suite for argp.
-# Copyright (C) 2006-20
07
Free Software Foundation, Inc.
+# Copyright (C) 2006-20
14
Free Software Foundation, Inc.
# This file is part of the GNUlib Library.
#
# This program is free software: you can redistribute it and/or modify
# This file is part of the GNUlib Library.
#
# This program is free software: you can redistribute it and/or modify
@@
-27,30
+27,31
@@
func_compare() {
sed '1{
s,: [^ ]*/test-argp,: test-argp,
s,: test-argp\.exe,: test-argp,
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
cat > $TMP <<EOT
####
# Test --usage output
cat > $TMP <<EOT
-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...
+Usage: test-argp [-tvCSOlp?V] [-f FILE] [-
r FILE] [-o[ARG]] [--test
]
+ [--
file=FILE] [--input=FILE] [--read=FILE] [--verbose] [--cantiga
]
+ [--
sonet] [--option] [--optional[=ARG]] [--limerick] [--poem
]
+ [--
help] [--usage] [--
version] ARGS...
EOT
EOT
-./test-argp --usage | func_compare || ERR=1
+./test-argp
$EXEEXT
--usage | func_compare || ERR=1
####
# Test working usage-indent format
cat > $TMP <<EOT
####
# Test working usage-indent format
cat > $TMP <<EOT
-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...
+Usage: test-argp [-tvCSOlp?V] [-f FILE] [-r FILE] [-o[ARG]] [--test]
+[--file=FILE] [--input=FILE] [--read=FILE] [--verbose] [--cantiga] [--sonet]
+[--option] [--optional[=ARG]] [--limerick] [--poem] [--help] [--usage]
+[--version] ARGS...
EOT
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
####
# Test --help output
@@
-62,7
+63,8
@@
documentation string
-t, --test
Option Group 1
-t, --test
Option Group 1
- -f, --file=FILE, --input=FILE Option with a mandatory argument
+ -f, -r, --file=FILE, --input=FILE, --read=FILE
+ Option with a mandatory argument
-v, --verbose Simple option without arguments
Option Group 1.1
-v, --verbose Simple option without arguments
Option Group 1.1
@@
-93,16
+95,18
@@
for any corresponding short options.
Report bugs to <>.
EOT
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 ambiguous option handling
-./test-argp --optio 2>/dev/null && ERR=1
+./test-argp
$EXEEXT
--optio 2>/dev/null && ERR=1
####
# Run built-in tests
####
# Run built-in tests
-./test-argp || ERR=1
+./test-argp
$EXEEXT
|| ERR=1
rm $TMP
rm $TMP