diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae59480 --- /dev/null +++ b/.gitignore @@ -0,0 +1,76 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache/ +config.log +config.status +config/Makefile +# config/Makefile.in +config/config.h +config/config.h.in +config/stamp-h1 +configure +docs/Doxyfile +docs/Makefile +docs/Makefile.in +docs/html/ +examples/.deps/ +examples/Makefile +examples/Makefile.in +examples/test1 +examples/test1.o +examples/test10 +examples/test10.o +examples/test11 +examples/test11.o +examples/test12 +examples/test12.o +examples/test13 +examples/test13.o +examples/test14 +examples/test14.o +examples/test15 +examples/test15.o +examples/test16 +examples/test16.o +examples/test17 +examples/test17-a.o +examples/test17.o +examples/test18 +examples/test18.o +examples/test19 +examples/test19.o +examples/test2 +examples/test2.o +examples/test20 +examples/test20.o +examples/test21 +examples/test21.o +examples/test22 +examples/test22.o +examples/test3 +examples/test3.o +examples/test4 +examples/test4.o +examples/test5 +examples/test5.o +examples/test6 +examples/test6.o +examples/test7 +examples/test7.o +examples/test8 +examples/test8.o +examples/test9 +examples/test9.o +include/Makefile +include/Makefile.in +include/tclap/Makefile +include/tclap/Makefile.in +msc/Makefile +msc/Makefile.in +msc/examples/Makefile +msc/examples/Makefile.in +tclap.pc +tests/Makefile +tests/Makefile.in +tests/tmp.out diff --git a/include/tclap/StdOutput.h b/include/tclap/StdOutput.h index 35f7b99..944cff4 100644 --- a/include/tclap/StdOutput.h +++ b/include/tclap/StdOutput.h @@ -143,7 +143,8 @@ inline void StdOutput::failure( CmdLineInterface& _cmd, _shortUsage( _cmd, std::cerr ); std::cerr << std::endl << "For complete USAGE and HELP type: " - << std::endl << " " << progName << " --help" + << std::endl << " " << progName << " " + << Arg::nameStartString() << "help" << std::endl << std::endl; } else diff --git a/tests/Makefile.am b/tests/Makefile.am index 179f80f..8e466f8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -78,7 +78,8 @@ TESTS = test1.sh \ test76.sh \ test77.sh \ test78.sh \ - test79.sh + test79.sh \ + test80.sh EXTRA_DIST = $(TESTS) \ test1.out \ @@ -159,6 +160,7 @@ EXTRA_DIST = $(TESTS) \ test76.out \ test77.out \ test78.out \ - test79.out + test79.out \ + test80.out CLEANFILES = tmp.out diff --git a/tests/runtests.sh b/tests/runtests.sh index e4e64e4..b0ad68f 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -2,7 +2,7 @@ let "suc = 0" let "fail = 0" -NUMTEST=67 +NUMTEST=79 for (( tno = 1 ; $tno <= $NUMTEST ; tno = $tno + 1 )); do ./testCheck.sh $tno diff --git a/tests/test79.out b/tests/test79.out index 9797c85..9e7b467 100644 --- a/tests/test79.out +++ b/tests/test79.out @@ -1 +1,9 @@ -My name is: mike +PARSE ERROR: + Required argument missing: name + +Brief USAGE: + ../examples/test21 [/r] /n [//] [~~version] [/h] + +For complete USAGE and HELP type: + ../examples/test21 ~~help + diff --git a/tests/test79.sh b/tests/test79.sh index 7b86e6d..681c6ac 100755 --- a/tests/test79.sh +++ b/tests/test79.sh @@ -1,7 +1,6 @@ #!/bin/sh - -# success (everything but -n mike should be ignored) -../examples/test22 asdf -n mike asdf fds xxx > tmp.out 2>&1 +# success +../examples/test21 > tmp.out 2>&1 if cmp -s tmp.out $srcdir/test79.out; then exit 0 diff --git a/tests/test80.out b/tests/test80.out new file mode 100644 index 0000000..9797c85 --- /dev/null +++ b/tests/test80.out @@ -0,0 +1 @@ +My name is: mike diff --git a/tests/test80.sh b/tests/test80.sh new file mode 100755 index 0000000..7d82341 --- /dev/null +++ b/tests/test80.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# success (everything but -n mike should be ignored) +../examples/test22 asdf -n mike asdf fds xxx > tmp.out 2>&1 + +if cmp -s tmp.out $srcdir/test80.out; then + exit 0 +else + exit 1 +fi +