From 9811f7fd4a52c34555b60591f24f177505930ca8 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Mon, 14 Nov 2011 19:45:13 +0000 Subject: [PATCH] The pwconv, pwunconv, grpconv, and grpunconv utils now have complete usage message and report a usage error if needed. --- tests/convtools/20_pwunconv_usage_option/data/usage.out | 8 +++++++- tests/convtools/20_pwunconv_usage_option/pwunconv.test | 2 +- tests/convtools/22_grpunconv_usage_option/data/usage.out | 8 +++++++- tests/convtools/22_grpunconv_usage_option/grpunconv.test | 2 +- tests/convtools/25_pwconv_usage_option/data/usage.out | 8 +++++++- tests/convtools/26_grpconv_usage_option/data/usage.out | 8 +++++++- 6 files changed, 30 insertions(+), 6 deletions(-) diff --git a/tests/convtools/20_pwunconv_usage_option/data/usage.out b/tests/convtools/20_pwunconv_usage_option/data/usage.out index 8e645672..30fff4db 100644 --- a/tests/convtools/20_pwunconv_usage_option/data/usage.out +++ b/tests/convtools/20_pwunconv_usage_option/data/usage.out @@ -1 +1,7 @@ -Usage: pwunconv +pwunconv: invalid option -- 'Z' +Usage: pwunconv [options] + +Options: + -h, --help display this help message and exit + -R, --root CHROOT_DIR directory to chroot into + diff --git a/tests/convtools/20_pwunconv_usage_option/pwunconv.test b/tests/convtools/20_pwunconv_usage_option/pwunconv.test index 46e11751..fa2a9d7c 100755 --- a/tests/convtools/20_pwunconv_usage_option/pwunconv.test +++ b/tests/convtools/20_pwunconv_usage_option/pwunconv.test @@ -23,7 +23,7 @@ pwunconv -Z 2>tmp/usage.out && exit 1 || { echo "OK" echo -n "Check returned status ($status)..." -test "$status" = "1" +test "$status" = "2" echo "OK" echo "pwunconv reported:" diff --git a/tests/convtools/22_grpunconv_usage_option/data/usage.out b/tests/convtools/22_grpunconv_usage_option/data/usage.out index f9cbe2a6..7528279f 100644 --- a/tests/convtools/22_grpunconv_usage_option/data/usage.out +++ b/tests/convtools/22_grpunconv_usage_option/data/usage.out @@ -1 +1,7 @@ -Usage: grpunconv +grpunconv: invalid option -- 'Z' +Usage: grpunconv [options] + +Options: + -h, --help display this help message and exit + -R, --root CHROOT_DIR directory to chroot into + diff --git a/tests/convtools/22_grpunconv_usage_option/grpunconv.test b/tests/convtools/22_grpunconv_usage_option/grpunconv.test index 0570769d..5c3bc823 100755 --- a/tests/convtools/22_grpunconv_usage_option/grpunconv.test +++ b/tests/convtools/22_grpunconv_usage_option/grpunconv.test @@ -23,7 +23,7 @@ grpunconv -Z 2>tmp/usage.out && exit 1 || { echo "OK" echo -n "Check returned status ($status)..." -test "$status" = "1" +test "$status" = "2" echo "OK" echo "grpunconv reported:" diff --git a/tests/convtools/25_pwconv_usage_option/data/usage.out b/tests/convtools/25_pwconv_usage_option/data/usage.out index 085ce21d..8ecc6af5 100644 --- a/tests/convtools/25_pwconv_usage_option/data/usage.out +++ b/tests/convtools/25_pwconv_usage_option/data/usage.out @@ -1 +1,7 @@ -Usage: pwconv +pwconv: invalid option -- 'Z' +Usage: pwconv [options] + +Options: + -h, --help display this help message and exit + -R, --root CHROOT_DIR directory to chroot into + diff --git a/tests/convtools/26_grpconv_usage_option/data/usage.out b/tests/convtools/26_grpconv_usage_option/data/usage.out index b426cb30..5da31b4b 100644 --- a/tests/convtools/26_grpconv_usage_option/data/usage.out +++ b/tests/convtools/26_grpconv_usage_option/data/usage.out @@ -1 +1,7 @@ -Usage: grpconv +grpconv: invalid option -- 'Z' +Usage: grpconv [options] + +Options: + -h, --help display this help message and exit + -R, --root CHROOT_DIR directory to chroot into +