Most of the test shell scripts use {} around variable names even when it's
not required, for consistency. lib/exeter didn't do so consistently,
however. Correct that.
Signed-off-by: David Gibson
---
test/lib/exeter | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/test/lib/exeter b/test/lib/exeter
index 3b19beaa..0b361599 100644
--- a/test/lib/exeter
+++ b/test/lib/exeter
@@ -13,18 +13,18 @@
# Copyright Red Hat
# Author: David Gibson
-EXETOOL="$BASEPATH/exeter/exetool/exetool"
+EXETOOL="${BASEPATH}/exeter/exetool/exetool"
# is_exeter() - Determine if a test file is an exeter program
# $@: Command line to invoke test program
is_exeter() {
- $EXETOOL probe -- "$@"
+ ${EXETOOL} probe -- "${@}"
}
# exeter() - Run each test in an exeter program, logging each test separately
# $@: Command line to invoke exeter test program
exeter() {
- STATESETUP="${STATEBASE}/$1"
+ STATESETUP="${STATEBASE}/${1}"
mkdir -p "${STATESETUP}"
context_setup_host host
@@ -32,9 +32,9 @@ exeter() {
cd test
- __ntests=$($EXETOOL list -- "$@" | wc -l)
- if [ $? != 0 ]; then
- info "Failed to get exeter manifest for $@"
+ __ntests=$(${EXETOOL} list -- "${@}" | wc -l)
+ if [ ${?} != 0 ]; then
+ info "Failed to get exeter manifest for ${@}"
pause_continue \
"Press any key to pause test session" \
"Resuming in " \
@@ -43,13 +43,13 @@ exeter() {
return
fi
- status_file_start "$* (exeter)" ${__ntests}
+ status_file_start "${*} (exeter)" ${__ntests}
[ ${CI} -eq 1 ] && video_link "${1}"
- for __testid in $($EXETOOL list -- "$@"); do
- __desc="$($EXETOOL desc -- "$@" -- ${__testid})"
+ for __testid in $(${EXETOOL} list -- "${@}"); do
+ __desc="$(${EXETOOL} desc -- "${@}" -- ${__testid})"
status_test_start "${__desc}"
- context_run host "$@" "${__testid}" && status_test_ok || status_test_fail
+ context_run host "${@}" "${__testid}" && status_test_ok || status_test_fail
done
cd ..
--
2.51.0