From: Yi Zhang Commit 8eca9fa369ee ("common/rc, scsi/011, zbd/010: introduce _page_size_equals() helper") introduced the helper bash function _get_page_size(). Replace "getconf PAGE_SIZE" with the helper to cut dependency to the getconf tool. Link: https://github.com/linux-blktests/blktests/pull/243 Signed-off-by: Yi Zhang [Shin'ichiro: removed getconf command check in zbd/014] Signed-off-by: Shin'ichiro Kawasaki --- tests/throtl/002 | 2 +- tests/throtl/003 | 2 +- tests/throtl/007 | 2 +- tests/zbd/014 | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/throtl/002 b/tests/throtl/002 index 08e685f..275c900 100755 --- a/tests/throtl/002 +++ b/tests/throtl/002 @@ -21,7 +21,7 @@ test() { local io_size_kb block_size local iops=256 - page_size=$(getconf PAGE_SIZE) + page_size=$(_get_page_size) if ! _set_up_throtl --sector_size "${page_size}"; then return 1; diff --git a/tests/throtl/003 b/tests/throtl/003 index 700e9e6..b45123a 100755 --- a/tests/throtl/003 +++ b/tests/throtl/003 @@ -18,7 +18,7 @@ test() { echo "Running ${TEST_NAME}" local page_size - page_size=$(getconf PAGE_SIZE) + page_size=$(_get_page_size) if ! _set_up_throtl --sector_size "${page_size}"; then return 1; diff --git a/tests/throtl/007 b/tests/throtl/007 index 97dece6..4292feb 100755 --- a/tests/throtl/007 +++ b/tests/throtl/007 @@ -19,7 +19,7 @@ test() { echo "Running ${TEST_NAME}" local page_size - page_size=$(getconf PAGE_SIZE) + page_size=$(_get_page_size) if ! _set_up_throtl --sector_size "${page_size}"; then return 1; diff --git a/tests/zbd/014 b/tests/zbd/014 index 35ecc85..18e6fd9 100755 --- a/tests/zbd/014 +++ b/tests/zbd/014 @@ -23,7 +23,6 @@ requires() { _have_driver f2fs _have_driver null_blk _have_program fscrypt - _have_program getconf _have_program mkfs.f2fs for o in BLK_INLINE_ENCRYPTION_FALLBACK FS_ENCRYPTION_INLINE_CRYPT; do if ! _check_kernel_option "$o"; then @@ -112,7 +111,7 @@ run_test() { local bio_max_vecs=256 local page_size - page_size=$(getconf PAGE_SIZE) + page_size=$(_get_page_size) # In bytes. local max_inl_encr_bio_size=$((bio_max_vecs * page_size)) -- 2.49.0