It was possible to run kvm-xfstests with arguments like '-c encrypt
smoke', in which case FSTESTCFG ended up set to "4k" because 'smoke'
implies '-c 4k' and the second config specification overrode the first.
If the user tries something like this, fail with a helpful error message
rather than proceeding with a configuration that likely wasn't intended.
Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
---
kvm-xfstests/util/parse_cli | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/kvm-xfstests/util/parse_cli b/kvm-xfstests/util/parse_cli
index 6dae32f..a170931 100644
--- a/kvm-xfstests/util/parse_cli
+++ b/kvm-xfstests/util/parse_cli
@@ -1,6 +1,6 @@
#!/bin/bash
-FSTESTCFG=all
+FSTESTCFG=""
SNAPSHOT=",snapshot=on"
DO_AEX="yes"
API="1.3"
@@ -118,6 +118,12 @@ while [ "$1" != "" ]; do
DO_AEX=""
;;
-c) shift
+ if test -n "$FSTESTCFG" ; then
+ echo "The '-c' option (or 'smoke') can only be specified once. "
+ echo "If you want to run tests in multiple configurations," \
+ "use -c CFG1,CFG2,..."
+ exit 1
+ fi
for i in ${1//,/ }
do
validate_config_name "$i"
@@ -317,6 +323,11 @@ while [ "$1" != "" ]; do
fi
;;
smoke)
+ if test -n "$FSTESTCFG" ; then
+ echo "You can use either '-c' or 'smoke', not both! " \
+ "'smoke' means '-c 4k -g quick'."
+ exit 1
+ fi
FSTESTCFG=4k
FSTESTSET="$FSTESTSET,-g,quick"
;;
@@ -357,6 +368,10 @@ while [ "$1" != "" ]; do
shift
done
+if test -z "$FSTESTCFG" ; then
+ FSTESTCFG=all
+fi
+
if test -z "$FSTESTSET" -a -z "$ARG"
then
echo -e "No tests specified!\n"
--
2.8.0.rc3.226.g39d4020
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
