From: Michał Kępień <michal@isc.org>
Date: Fri, 26 Jan 2018 12:05:02 +0000 (+0100)
Subject: [rt46602] Clean up getopts usage
X-Git-Tag: v9.13.0~158^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dcee1cad33c8a890b1714707cf361e612df15bc;p=thirdparty%2Fbind9.git

[rt46602] Clean up getopts usage

Ensure case clauses are in sync with the string passed to getopts.
Remove catch-all clauses as they will never be evaluated.
---

diff --git a/bin/tests/system/clean.sh b/bin/tests/system/clean.sh
index 84c369e0af5..a53724917c2 100644
--- a/bin/tests/system/clean.sh
+++ b/bin/tests/system/clean.sh
@@ -24,7 +24,6 @@ runall=0
 while getopts "r" flag; do
     case $flag in
 	r) runall=1 ;;
-	*) exit 1;;
     esac
 done
 shift `expr $OPTIND - 1`
diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 549313bf508..9a7e472a42b 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -17,13 +17,12 @@ stopservers=true
 clean=true
 baseport=5300
 
-while getopts "rnp:d:" flag; do
+while getopts "knp:r" flag; do
     case "$flag" in
 	k) stopservers=false ;;
 	n) clean=false ;;
 	p) baseport=$OPTARG ;;
 	r) runall="-r" ;;
-	*) exit 1 ;;
     esac
 done
 shift `expr $OPTIND - 1`
diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index c28296dad7a..54da64ea52a 100644
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -25,7 +25,6 @@ usage="Usage: ./runall.sh [-n] [numprocesses]"
 while getopts "n" flag; do
     case "$flag" in
 	n) CLEANFLAG="NOCLEAN=-n" ;;
-	*) echo "$usage" >&2 ; exit 1 ;;
     esac
 done
 shift `expr $OPTIND - 1`
diff --git a/bin/tests/system/testsummary.sh b/bin/tests/system/testsummary.sh
index 45beed8ab26..8b046b61cbc 100644
--- a/bin/tests/system/testsummary.sh
+++ b/bin/tests/system/testsummary.sh
@@ -29,7 +29,6 @@ keepfile=0
 while getopts "n" flag; do
     case $flag in
 	n) keepfile=1 ;;
-	*) exit 1 ;;
     esac
 done