[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.

(cherry picked from commit 0dcee1cad33c8a890b1714707cf361e612df15bc)
(cherry picked from commit 0c8e56568fa3f98bef36d6fd887b50d885ba207b)
(cherry picked from commit 6d9fb2b42975c52cb6bafa7e408632cc0914bd93)

diff --git a/bin/tests/system/clean.sh b/bin/tests/system/clean.sh
index 91b3ac8cf3455710b634d4db904ea6870c976ce5..e00a0a79903d539877b524f52b76deef91761427 100644 (file)
--- a/bin/tests/system/clean.sh
+++ b/bin/tests/system/clean.sh
@@ -32,7 +32,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 948eb0cd8198581f41625476f11b9e97ce1acb70..073f09b6552c0ca4b2251a62a653cd1db916c0dc 100644 (file)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -26,13 +26,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 888e13e6d4e2fe6f0020496cde850e6e45cb7c2d..50656f9aef3b05c66b21435e11558df44f9fa123 100644 (file)
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -34,7 +34,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 45beed8ab2680209da4b6f47308bbe32e1dcf563..8b046b61cbc548f29391b85c7e99e3d4b4e4bbf4 100644 (file)
--- 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