streamline display of --help in all tools

By convention, if I run a tool with --help or --version I expect it to
exit successfully with the usage, while if I do call it wrong (like
without any parameters) I expect the usage message shown with a non-zero
exit.

2 files changed, 54 insertions, 0 deletions

diff --git a/test/integration/framework b/test/integration/framework
index 153c5bb25..dd66f2a0c 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -128,6 +128,7 @@ aptwebserver() { runapt "${APTWEBSERVERBINDIR}/aptwebserver" "$@"; }
 aptitude() { runapt aptitude "$@"; }
 aptextracttemplates() { runapt apt-extracttemplates "$@"; }
 aptinternalsolver() { runapt "${APTINTERNALSOLVER}" "$@"; }
+aptdumpsolver() { runapt "${APTDUMPSOLVER}" "$@"; }
 
 dpkg() {
 	command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@"
@@ -194,6 +195,7 @@ setupenvironment() {
         APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"}
         APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"}
         APTINTERNALSOLVER=${APT_INTEGRATION_TESTS_INTERNAL_SOLVER:-"${BUILDDIRECTORY}/apt-internal-solver"}
+	APTDUMPSOLVER=${APT_INTEGRATION_TESTS_DUMP_SOLVER:-"${BUILDDIRECTORY}/apt-dump-solver"}
 	test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
         # -----
 
diff --git a/test/integration/test-00-commands-have-help b/test/integration/test-00-commands-have-help
new file mode 100755
index 000000000..ebf8b8cfa
--- /dev/null
+++ b/test/integration/test-00-commands-have-help
@@ -0,0 +1,52 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+
+# this test does double duty: The obvious is checking for --help and co,
+# but it also checks if the binary can find all methods in the library.
+# The later is quite handy for manual testing of non-abibreaking changes
+export LD_BIND_NOW=1
+
+checkversionmessage() {
+	testsuccess grep '^apt .* compiled on ' ${1}-help.output
+}
+
+checkhelpmessage() {
+	checkversionmessage "$1"
+	testsuccess grep '^Usage:' ${1}-help.output
+}
+
+checkoptions() {
+	testsuccess $1 --help
+	cp -f rootdir/tmp/testsuccess.output ${1}-help.output
+	checkhelpmessage "$1"
+
+	testsuccess $1 --version
+	cp -f rootdir/tmp/testsuccess.output ${1}-help.output
+	checkversionmessage "$1"
+}
+
+for CMD in 'apt-cache' 'apt-cdrom' 'apt-config' \
+	'apt-extracttemplates' 'apt-get' 'apt-helper' \
+	'apt-mark' 'apt-sortpkgs' 'apt' 'apt-ftparchive'; do
+	cmd="$(echo "$CMD" | tr -d '-')"
+	msgtest 'Test for failure with no parameters calling' "$CMD"
+	if $cmd > ${cmd}-help.output 2>&1; then
+		echo
+		cat ${cmd}-help.output
+		msgfail 'zero exit'
+	else
+		msgpass
+	fi
+	checkhelpmessage "$cmd"
+	checkoptions "$cmd"
+done
+
+for CMD in 'apt-dump-solver'  'apt-internal-solver'; do
+	checkoptions "$(echo "$CMD" | tr -d '-')"
+done