blktests: Use old variable check for Bash <4.2
PATCH 1/1 blktests: Use old variable check for Bash <4.2
Bash 4.2 and above supports -v variable checks, which returns true for set or null. Instead use an older bashism that is compatible with bash 4.1 and earlier but only returns true if the variable is set non-null. This inherently adds a sanity check in case of null variables.
--- check | 20 ++++++++++---------- common/cgroup | 2 +- common/fio | 2 +- common/rc | 2 +- tests/meta/rc | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-)
check +10 -10
@@ -196,7 +196,7 @@ _output_status() { if (( RUN_FOR_ZONED )); then zoned=" (zoned) "; fi - if [[ -v DESCRIPTION ]]; then + if [[ "${DESCRIPTION:-}" ]]; then printf '%-60s' "${test}${zoned}($DESCRIPTION)" else printf '%-60s' "${test}${zoned}"
@@ -233,7 +233,7 @@ _output_notrun() { } _output_last_test_run() { - if [[ -v TEST_DEV ]]; then + if [[ "${TEST_DEV:-}" ]]; then _output_status "$TEST_NAME => $(basename "$TEST_DEV")" "" else _output_status "$TEST_NAME" ""
@@ -258,7 +258,7 @@ _output_test_run() { tput cuu $((${#LAST_TEST_RUN[@]} - 3)) fi - if [[ -v TEST_DEV ]]; then + if [[ "${TEST_DEV:-}" ]]; then _output_status "$TEST_NAME => $(basename "$TEST_DEV")" "${TEST_RUN["status"]}ed" else _output_status "$TEST_NAME" "${TEST_RUN["status"]}ed"
@@ -288,7 +288,7 @@ _output_test_run() { } _cleanup() { - if [[ -v TMPDIR ]]; then + if [[ "${TMPDIR:-}" ]]; then rm -rf "$TMPDIR" unset TMPDIR fi
@@ -300,7 +300,7 @@ _cleanup() { unset TEST_DEV_QUEUE_SAVED["$key"] done - if [[ -v RESTORE_CPUS_ONLINE ]]; then + if [[ "${RESTORE_CPUS_ONLINE:-}" ]]; then local cpu for cpu in "${!CPUS_ONLINE_SAVED[@]}"; do echo "${CPUS_ONLINE_SAVED["$cpu"]}" >"/sys/devices/system/cpu/cpu$cpu/online"
@@ -659,18 +659,18 @@ fi : "${QUICK_RUN:=0}" : "${RUN_ZONED_TESTS:=0}" : "${OUTPUT:=results}" -if [[ -v EXCLUDE ]] && ! declare -p EXCLUDE | grep -q '^declare -a'; then +if [[ "${EXCLUDE:-}" ]] && ! declare -p EXCLUDE | grep -q '^declare -a'; then # If EXCLUDE was not defined as an array, convert it to one. # shellcheck disable=SC2190,SC2206 EXCLUDE=($EXCLUDE) -elif [[ ! -v EXCLUDE ]]; then +elif [[ ! "${EXCLUDE:-}" ]]; then EXCLUDE=() fi -if [[ -v TEST_DEVS ]] && ! declare -p TEST_DEVS | grep -q '^declare -a'; then +if [[ "${TEST_DEVS:-}" ]] && ! declare -p TEST_DEVS | grep -q '^declare -a'; then # If TEST_DEVS was not defined as an array, convert it to one. # shellcheck disable=SC2206 TEST_DEVS=($TEST_DEVS) -elif [[ ! -v TEST_DEVS ]]; then +elif [[ ! "${TEST_DEVS:-}" ]]; then TEST_DEVS=() fi
@@ -709,7 +709,7 @@ while true; do esac done -if [[ $QUICK_RUN -ne 0 && ! -v TIMEOUT ]]; then +if [[ $QUICK_RUN -ne 0 && ! "${TIMEOUT:-}" ]]; then _error "QUICK_RUN specified without TIMEOUT" fi
common/cgroup +1 -1
@@ -22,7 +22,7 @@ _init_cgroup2() _exit_cgroup2() { - if [[ -v CGROUP2_DIR ]]; then + if [[ "${CGROUP2_DIR:-}" ]]; then find "$CGROUP2_DIR" -type d -delete unset CGROUP2_DIR fi
common/fio +1 -1
@@ -161,7 +161,7 @@ _fio_perf() { _run_fio() { local args=("--output=$TMPDIR/fio_perf" "--output-format=terse" "--terse-version=4" "--group_reporting=1") - if [[ -v TIMEOUT ]]; then + if [[ "${TIMEOUT:-}" ]]; then args+=("--runtime=$TIMEOUT") fi
common/rc +1 -1
@@ -15,7 +15,7 @@ shopt -s extglob # for TIMEOUT / number of subtests. _divide_timeout() { local num_tests="$1" - if [[ -v TIMEOUT ]]; then + if [[ "${TIMEOUT:-}" ]]; then ((TIMEOUT = (TIMEOUT + num_tests - 1) / num_tests)) fi }
tests/meta/rc +2 -2
@@ -7,7 +7,7 @@ . common/rc group_requires() { - if [[ -v META_REQUIRES_SKIP ]]; then + if [[ "${META_REQUIRES_SKIP:-}" ]]; then SKIP_REASON="META_REQUIRES_SKIP was set" return 1 fi
@@ -15,7 +15,7 @@ group_requires() { } group_device_requires() { - if [[ -v META_DEVICE_REQUIRES_SKIP ]]; then + if [[ "${META_DEVICE_REQUIRES_SKIP:-}" ]]; then SKIP_REASON="META_DEVICE_REQUIRES_SKIP was set" return 1 fi
Signature · 1 line
1.7.1
PATCH 1/1 blktests: Use old variable check for Bash <4.2
Quoted 4 lines · Jon Derrick
Bash 4.2 and above supports -v variable checks, which returns true for set or null. Instead use an older bashism that is compatible with bash 4.1 and earlier but only returns true if the variable is set non-null. This inherently adds a sanity check in case of null variables.
Bart previous sent a patch for supporting bash 4.1, and according to him, there were some further changes required:
https://github.com/osandov/blktests/pull/42
Either Bart's list of missing features was too big, or this patch isn't enough to support 4.1. If it's the latter, then this is a no-go, because Bart's change was too intrusive to be worth the hassle. If it's the former, then this change isn't quite as bad, but I'm still not excited about supporting a 10 year old version of Bash.
PATCH 1/1 blktests: Use old variable check for Bash <4.2
Quoted 14 lines · Omar Sandoval
Quoted 7 lines · Jon Derrick
Bash 4.2 and above supports -v variable checks, which returns true for
set or null. Instead use an older bashism that is compatible with bash
4.1 and earlier but only returns true if the variable is set non- null.
This inherently adds a sanity check in case of null variables.Bart previous sent a patch for supporting bash 4.1, and according to him, there were some further changes required:
Quoted 8 lines
Either Bart's list of missing features was too big, or this patch isn't
enough to support 4.1. If it's the latter, then this is a no-go, because
Bart's change was too intrusive to be worth the hassle. If it's the former, then this change isn't quite as bad, but I'm still not excited
about supporting a 10 year old version of Bash.
Mine is more than likely some franken-bash. I tested my changes alone on a 4.1.2 from RHEL 6.7. RHEL 6.10 is recently released so this version of Bash is certainly still in use.
I also understand about supporting old bash, so I'm perfectly fine keeping it out-of-tree and patching in as needed.
Regards
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3278 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-nvme/attachments/20190506/d2fc7c26/attachment.bin>
PATCH 1/1 blktests: Use old variable check for Bash <4.2
Quoted 25 lines · Jonathan
Quoted 14 lines · Omar Sandoval
Quoted 7 lines · Jon Derrick
Bash 4.2 and above supports -v variable checks, which returns true for
set or null. Instead use an older bashism that is compatible with bash
4.1 and earlier but only returns true if the variable is set non- null.
This inherently adds a sanity check in case of null variables.Bart previous sent a patch for supporting bash 4.1, and according to him, there were some further changes required:
Quoted 8 lines
Either Bart's list of missing features was too big, or this patch isn't
enough to support 4.1. If it's the latter, then this is a no-go, because
Bart's change was too intrusive to be worth the hassle. If it's the former, then this change isn't quite as bad, but I'm still not excited
about supporting a 10 year old version of Bash.
Quoted 3 lines
Mine is more than likely some franken-bash. I tested my changes alone on a 4.1.2 from RHEL 6.7. RHEL 6.10 is recently released so this version of Bash is certainly still in use.
Ah, I didn't realize RHEL was using that version. In that case, I'm alright with this patch, since it's not quite as nasty as Bart's change. Thanks!