mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-25 18:59:33 +03:00
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 <behlendorf1@llnl.gov> Reviewed-by: Giuseppe Di Natale <guss80@gmail.com> Reviewed-by: John Kennedy <john.kennedy@delphix.com> Signed-off-by: Ryan Moeller <ryan@ixsystems.com> Closes #9212
This commit is contained in:
parent
9ad6f69a03
commit
be6ae01435
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user