]> www.infradead.org Git - users/sagi/blktests.git/commitdiff
check, tests/meta/012: Use array["index"] instead of array[index]
authorBart Van Assche <bart.vanassche@wdc.com>
Tue, 19 Jun 2018 20:23:47 +0000 (13:23 -0700)
committerOmar Sandoval <osandov@fb.com>
Mon, 25 Jun 2018 19:15:21 +0000 (12:15 -0700)
This causes shellcheck to stop complaining about these array element
accesses.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
check
tests/meta/012

diff --git a/check b/check
index 1c0ad20768d6f3a3cd1ffeb61d1c32c7b59ef7d1..1dcaddb7c9d3051e81f2f859a0555ede2cb6ca78 100755 (executable)
--- a/check
+++ b/check
@@ -159,11 +159,11 @@ declare -A TEST_RUN
 _read_last_test_run() {
        local seqres="${RESULTS_DIR}/${TEST_NAME}"
 
-       LAST_TEST_RUN[date]=""
-       LAST_TEST_RUN[status]=""
-       LAST_TEST_RUN[reason]=""
-       LAST_TEST_RUN[exit_status]=""
-       LAST_TEST_RUN[runtime]=""
+       LAST_TEST_RUN["date"]=""
+       LAST_TEST_RUN["status"]=""
+       LAST_TEST_RUN["reason"]=""
+       LAST_TEST_RUN["exit_status"]=""
+       LAST_TEST_RUN["runtime"]=""
 
        if [[ ! -e $seqres ]]; then
                return
@@ -250,9 +250,9 @@ _output_test_run() {
        fi
 
        if [[ -v TEST_DEV ]]; then
-               _output_status "$TEST_NAME => $(basename "$TEST_DEV")" "${TEST_RUN[status]}ed"
+               _output_status "$TEST_NAME => $(basename "$TEST_DEV")" "${TEST_RUN["status"]}ed"
        else
-               _output_status "$TEST_NAME" "${TEST_RUN[status]}ed"
+               _output_status "$TEST_NAME" "${TEST_RUN["status"]}ed"
        fi
 
        (
@@ -309,14 +309,14 @@ _call_test() {
        _read_last_test_run
        _output_last_test_run
 
-       TEST_RUN[date]="$(date "+%F %T")"
+       TEST_RUN["date"]="$(date "+%F %T")"
 
        mkdir -p "$(dirname "$seqres")"
        # Remove leftovers from last time.
        rm -f "${seqres}" "${seqres}."*
 
        if [[ -w /dev/kmsg ]]; then
-               local dmesg_marker="run blktests $TEST_NAME at ${TEST_RUN[date]}"
+               local dmesg_marker="run blktests $TEST_NAME at ${TEST_RUN["date"]}"
                echo "$dmesg_marker" >> /dev/kmsg
        else
                local dmesg_marker=""
@@ -331,35 +331,35 @@ _call_test() {
        TIMEFORMAT="%Rs"
        pushd . >/dev/null || return
        { time "$test_func" >"${seqres}.out" 2>&1; } 2>"${seqres}.runtime"
-       TEST_RUN[exit_status]=$?
+       TEST_RUN["exit_status"]=$?
        popd >/dev/null || return
-       TEST_RUN[runtime]="$(cat "${seqres}.runtime")"
+       TEST_RUN["runtime"]="$(cat "${seqres}.runtime")"
        rm -f "${seqres}.runtime"
 
        _cleanup
 
        if ! diff "tests/${TEST_NAME}.out" "${seqres}.out" >/dev/null; then
                mv "${seqres}.out" "${seqres}.out.bad"
-               TEST_RUN[status]=fail
-               TEST_RUN[reason]=output
-       elif [[ ${TEST_RUN[exit_status]} -ne 0 ]]; then
-               TEST_RUN[status]=fail
-               TEST_RUN[reason]="exit"
+               TEST_RUN["status"]=fail
+               TEST_RUN["reason"]=output
+       elif [[ ${TEST_RUN["exit_status"]} -ne 0 ]]; then
+               TEST_RUN["status"]=fail
+               TEST_RUN["reason"]="exit"
        elif ! _check_dmesg "$dmesg_marker"; then
-               TEST_RUN[status]=fail
-               TEST_RUN[reason]=dmesg
+               TEST_RUN["status"]=fail
+               TEST_RUN["reason"]=dmesg
        else
-               TEST_RUN[status]=pass
+               TEST_RUN["status"]=pass
        fi
        rm -f "${seqres}.out"
 
        _write_test_run
        _output_test_run
 
-       if [[ ${TEST_RUN[status]} = pass ]]; then
+       if [[ ${TEST_RUN["status"]} = pass ]]; then
                return 0
        else
-               case "${TEST_RUN[reason]}" in
+               case "${TEST_RUN["reason"]}" in
                output)
                        diff -u "tests/${TEST_NAME}.out" "${seqres}.out.bad" | awk "
                        {
@@ -372,7 +372,7 @@ _call_test() {
                        }"
                        ;;
                exit)
-                       echo "    exited with status ${TEST_RUN[exit_status]}"
+                       echo "    exited with status ${TEST_RUN["exit_status"]}"
                        ;;
                dmesg)
                        echo "    something found in dmesg:"
@@ -435,7 +435,7 @@ _run_test() {
 
 _run_group() {
        local tests=("$@")
-       local group="${tests[0]%/*}"
+       local group="${tests["0"]%/*}"
 
        # shellcheck disable=SC1090
        . "tests/${group}/group"
index fcf8fbdde2aa8990f257020fb18e35fb437a4cab..ab8c2a73eaa536e2de5fe9a6e2c0374bb52acd48 100755 (executable)
@@ -22,8 +22,8 @@ DESCRIPTION="record pid and random junk"
 test() {
        echo "Running ${TEST_NAME}"
        sleep 1
-       TEST_RUN[pid]=$$
-       TEST_RUN[random]="$(od -N $((4 * (RANDOM % 4))) -An -vtx1 /dev/urandom | tr -d ' \n')"
+       TEST_RUN["pid"]=$$
+       TEST_RUN["random"]="$(od -N $((4 * (RANDOM % 4))) -An -vtx1 /dev/urandom | tr -d ' \n')"
        TEST_RUN[$$]=hello
        echo "Test complete"
 }