summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Moeller <[email protected]>2019-08-25 21:30:39 -0400
committerBrian Behlendorf <[email protected]>2019-08-25 18:30:39 -0700
commita18f8bce5c6acb9c3990b2917efa96d1828e541c (patch)
tree081524e44d0c45c6efd1e1039ec0f57b80378ec8
parent4302698be16e88419b8b22194685372e012fa333 (diff)
Split argument list, satisfy shellcheck SC2086
Split the arguments for ${TEST_RUNNER} across multiple lines for clarity. Also added quotes in the message to match the invoked command. Unquoted variables in argument lists are subject to splitting. In this particular case we can't quote the variable because it is an optional argument. Use the method suggested in the description linked below, instead. The technique is to use an unquoted variable with an alternate value. https://github.com/koalaman/shellcheck/wiki/SC2086 Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Giuseppe Di Natale <[email protected]> Reviewed-by: John Kennedy <[email protected]> Signed-off-by: Ryan Moeller <[email protected]> Closes #9212
-rwxr-xr-xscripts/zfs-tests.sh19
1 files changed, 13 insertions, 6 deletions
diff --git a/scripts/zfs-tests.sh b/scripts/zfs-tests.sh
index 7c5286ba7..ce766e239 100755
--- a/scripts/zfs-tests.sh
+++ b/scripts/zfs-tests.sh
@@ -31,7 +31,7 @@ fi
PROG=zfs-tests.sh
VERBOSE="no"
-QUIET=
+QUIET=""
CLEANUP="yes"
CLEANUPALL="no"
LOOPBACK="yes"
@@ -307,7 +307,7 @@ while getopts 'hvqxkfScn:d:s:r:?t:T:u:I:' OPTION; do
VERBOSE="yes"
;;
q)
- QUIET="-q"
+ QUIET="yes"
;;
x)
CLEANUPALL="yes"
@@ -602,10 +602,17 @@ REPORT_FILE=$(mktemp -u -t zts-report.XXXX -p "$FILEDIR")
#
# Run all the tests as specified.
#
-msg "${TEST_RUNNER} ${QUIET} -c ${RUNFILE} -T ${TAGS} -i ${STF_SUITE}" \
- "-I ${ITERATIONS}"
-${TEST_RUNNER} ${QUIET} -c "${RUNFILE}" -T "${TAGS}" -i "${STF_SUITE}" \
- -I "${ITERATIONS}" 2>&1 | tee "$RESULTS_FILE"
+msg "${TEST_RUNNER} ${QUIET:+-q}" \
+ "-c \"${RUNFILE}\"" \
+ "-T \"${TAGS}\"" \
+ "-i \"${STF_SUITE}\"" \
+ "-I \"${ITERATIONS}\""
+${TEST_RUNNER} ${QUIET:+-q} \
+ -c "${RUNFILE}" \
+ -T "${TAGS}" \
+ -i "${STF_SUITE}" \
+ -I "${ITERATIONS}" \
+ 2>&1 | tee "$RESULTS_FILE"
#
# Analyze the results.