From 8e563553c0a26f0d8e8caf2a44b44a7f552531e9 Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Sat, 12 Mar 2022 11:44:20 +0530 Subject: [PATCH] LU-15626 tests: Fix "error" reported by shellcheck This patch fixes "error" issues reported by shellcheck for *.sh files. These files had only single error reported by shellcheck. The change in these files are init_test_env $@ (->to->) init_test_env "$@" Test-Parameters: trivial Test-Parameters: testlist=dom-performance,scrub-performance Test-Parameters: testlist=replay-single,replay-ost-single,replay-vbr Test-Parameters: testlist=sanity-pcc,sanity-pfl,sanity-selinux Test-Parameters: testlist=sanity-benchmark,parallel-scale Signed-off-by: Arshad Hussain Change-Id: I21fc2f25eb67d724b9e30c586568d2501648a80a Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/46811 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger Reviewed-by: Sarah Liu --- lustre/tests/dne_sanity.sh | 2 +- lustre/tests/dom-performance.sh | 2 +- lustre/tests/insanity.sh | 2 +- lustre/tests/large-lun.sh | 2 +- lustre/tests/lfsck-performance.sh | 2 +- lustre/tests/llmount.sh | 2 +- lustre/tests/llmountcleanup.sh | 2 +- lustre/tests/lustre-rsync-test.sh | 2 +- lustre/tests/mds-survey.sh | 2 +- lustre/tests/mdsrate-create-large.sh | 2 +- lustre/tests/mdsrate-create-small.sh | 2 +- lustre/tests/mdsrate-lookup-10dirs.sh | 2 +- lustre/tests/mdsrate-lookup-1dir.sh | 2 +- lustre/tests/mdsrate-stat-large.sh | 2 +- lustre/tests/mdsrate-stat-small.sh | 2 +- lustre/tests/metadata-updates.sh | 2 +- lustre/tests/mmp.sh | 2 +- lustre/tests/obdfilter-survey.sh | 2 +- lustre/tests/oos.sh | 2 +- lustre/tests/ost-pools.sh | 2 +- lustre/tests/parallel-scale-cifs.sh | 2 +- lustre/tests/parallel-scale-nfs.sh | 2 +- lustre/tests/parallel-scale-nfsv3.sh | 2 +- lustre/tests/parallel-scale-nfsv4.sh | 2 +- lustre/tests/parallel-scale.sh | 2 +- lustre/tests/performance-sanity.sh | 2 +- lustre/tests/posix.sh | 2 +- lustre/tests/replay-ost-single.sh | 2 +- lustre/tests/replay-single-lmv.sh | 2 +- lustre/tests/replay-single.sh | 2 +- lustre/tests/replay-vbr.sh | 2 +- lustre/tests/run-llog.sh | 2 +- lustre/tests/sanity-benchmark.sh | 2 +- lustre/tests/sanity-lsnapshot.sh | 2 +- lustre/tests/sanity-pcc.sh | 2 +- lustre/tests/sanity-pfl.sh | 2 +- lustre/tests/sanity-selinux.sh | 2 +- lustre/tests/scrub-performance.sh | 2 +- lustre/tests/sgpdd-survey.sh | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lustre/tests/dne_sanity.sh b/lustre/tests/dne_sanity.sh index 7a18b9d..d41d882 100644 --- a/lustre/tests/dne_sanity.sh +++ b/lustre/tests/dne_sanity.sh @@ -9,7 +9,7 @@ SRCDIR=$(dirname $0) LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$DNE_SANITY_EXCEPT " diff --git a/lustre/tests/dom-performance.sh b/lustre/tests/dom-performance.sh index db28ae5..f113506 100644 --- a/lustre/tests/dom-performance.sh +++ b/lustre/tests/dom-performance.sh @@ -10,7 +10,7 @@ ONLY=${ONLY:-"$*"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$DOM_PERFORMANCE_EXCEPT" diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh index 917c23c..f5813a91 100755 --- a/lustre/tests/insanity.sh +++ b/lustre/tests/insanity.sh @@ -6,7 +6,7 @@ set -e LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging # bug number for skipped test: diff --git a/lustre/tests/large-lun.sh b/lustre/tests/large-lun.sh index d2e6244..2c617a3 100644 --- a/lustre/tests/large-lun.sh +++ b/lustre/tests/large-lun.sh @@ -7,7 +7,7 @@ set -e LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$LARGE_LUN_EXCEPT" diff --git a/lustre/tests/lfsck-performance.sh b/lustre/tests/lfsck-performance.sh index dbbf3fe..131ace6 100644 --- a/lustre/tests/lfsck-performance.sh +++ b/lustre/tests/lfsck-performance.sh @@ -6,7 +6,7 @@ ONLY=${ONLY:-"$*"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$LFSCK_PERFORMANCE_EXCEPT" diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh index 1ecb983..f87b189 100755 --- a/lustre/tests/llmount.sh +++ b/lustre/tests/llmount.sh @@ -2,7 +2,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" [ -n "$LOAD" ] && load_modules && exit 0 [ -z "$NOFORMAT" ] && formatall diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh index 454ed6e..e37e711 100755 --- a/lustre/tests/llmountcleanup.sh +++ b/lustre/tests/llmountcleanup.sh @@ -2,6 +2,6 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" cleanupall -f diff --git a/lustre/tests/lustre-rsync-test.sh b/lustre/tests/lustre-rsync-test.sh index aeda8e3..06c3a21 100644 --- a/lustre/tests/lustre-rsync-test.sh +++ b/lustre/tests/lustre-rsync-test.sh @@ -13,7 +13,7 @@ ORIG_PWD=${PWD} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$LRSYNC_EXCEPT " diff --git a/lustre/tests/mds-survey.sh b/lustre/tests/mds-survey.sh index 93715b2..f879d97 100644 --- a/lustre/tests/mds-survey.sh +++ b/lustre/tests/mds-survey.sh @@ -3,7 +3,7 @@ set -e LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$MDS_SURVEY_EXCEPT " diff --git a/lustre/tests/mdsrate-create-large.sh b/lustre/tests/mdsrate-create-large.sh index 5eadc47..9b259a4 100644 --- a/lustre/tests/mdsrate-create-large.sh +++ b/lustre/tests/mdsrate-create-large.sh @@ -4,7 +4,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN diff --git a/lustre/tests/mdsrate-create-small.sh b/lustre/tests/mdsrate-create-small.sh index bea656f..0a4ef84 100644 --- a/lustre/tests/mdsrate-create-small.sh +++ b/lustre/tests/mdsrate-create-small.sh @@ -4,7 +4,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN diff --git a/lustre/tests/mdsrate-lookup-10dirs.sh b/lustre/tests/mdsrate-lookup-10dirs.sh index 2d235ff..f4c2f5c 100644 --- a/lustre/tests/mdsrate-lookup-10dirs.sh +++ b/lustre/tests/mdsrate-lookup-10dirs.sh @@ -12,7 +12,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN diff --git a/lustre/tests/mdsrate-lookup-1dir.sh b/lustre/tests/mdsrate-lookup-1dir.sh index ea73dc9..e5dba3a 100644 --- a/lustre/tests/mdsrate-lookup-1dir.sh +++ b/lustre/tests/mdsrate-lookup-1dir.sh @@ -11,7 +11,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN diff --git a/lustre/tests/mdsrate-stat-large.sh b/lustre/tests/mdsrate-stat-large.sh index 02625bc..78a4a01 100644 --- a/lustre/tests/mdsrate-stat-large.sh +++ b/lustre/tests/mdsrate-stat-large.sh @@ -12,7 +12,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN diff --git a/lustre/tests/mdsrate-stat-small.sh b/lustre/tests/mdsrate-stat-small.sh index f2ab39c..f789520 100644 --- a/lustre/tests/mdsrate-stat-small.sh +++ b/lustre/tests/mdsrate-stat-small.sh @@ -12,7 +12,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN diff --git a/lustre/tests/metadata-updates.sh b/lustre/tests/metadata-updates.sh index 86ae8db..ba4f283 100755 --- a/lustre/tests/metadata-updates.sh +++ b/lustre/tests/metadata-updates.sh @@ -10,7 +10,7 @@ ONLY=${ONLY:-"$*"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging #Bug number for skipped test: diff --git a/lustre/tests/mmp.sh b/lustre/tests/mmp.sh index a4997ed..bcafc18 100755 --- a/lustre/tests/mmp.sh +++ b/lustre/tests/mmp.sh @@ -12,7 +12,7 @@ ONLY=${ONLY:-"$*"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging # bug number for skipped test: diff --git a/lustre/tests/obdfilter-survey.sh b/lustre/tests/obdfilter-survey.sh index 059694e..1abd640 100644 --- a/lustre/tests/obdfilter-survey.sh +++ b/lustre/tests/obdfilter-survey.sh @@ -3,7 +3,7 @@ set -e LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging # bug number for skipped test: diff --git a/lustre/tests/oos.sh b/lustre/tests/oos.sh index 504f2fe..fb353e6 100755 --- a/lustre/tests/oos.sh +++ b/lustre/tests/oos.sh @@ -4,7 +4,7 @@ set -e LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" MOUNT=${MOUNT:-$1} MOUNT=${MOUNT:-/mnt/lustre} diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh index fb83be6..5796c27 100755 --- a/lustre/tests/ost-pools.sh +++ b/lustre/tests/ost-pools.sh @@ -9,7 +9,7 @@ ORIG_PWD=${PWD} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$OST_POOLS_EXCEPT" diff --git a/lustre/tests/parallel-scale-cifs.sh b/lustre/tests/parallel-scale-cifs.sh index ed88c28..d74ac32 100644 --- a/lustre/tests/parallel-scale-cifs.sh +++ b/lustre/tests/parallel-scale-cifs.sh @@ -15,7 +15,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging . $LUSTRE/tests/setup-cifs.sh diff --git a/lustre/tests/parallel-scale-nfs.sh b/lustre/tests/parallel-scale-nfs.sh index 7f426ee..34ca53e 100755 --- a/lustre/tests/parallel-scale-nfs.sh +++ b/lustre/tests/parallel-scale-nfs.sh @@ -6,7 +6,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh # only call init_test_env if this script is called directly if [[ -z "$TESTSUITE" || "$TESTSUITE" = "$(basename $0 .sh)" ]]; then - init_test_env $@ + init_test_env "$@" else . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} diff --git a/lustre/tests/parallel-scale-nfsv3.sh b/lustre/tests/parallel-scale-nfsv3.sh index 014d2cd..ea8f5ff 100755 --- a/lustre/tests/parallel-scale-nfsv3.sh +++ b/lustre/tests/parallel-scale-nfsv3.sh @@ -2,6 +2,6 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" sh $LUSTRE/tests/parallel-scale-nfs.sh 3 diff --git a/lustre/tests/parallel-scale-nfsv4.sh b/lustre/tests/parallel-scale-nfsv4.sh index 14ee9d6..ccb44bb 100755 --- a/lustre/tests/parallel-scale-nfsv4.sh +++ b/lustre/tests/parallel-scale-nfsv4.sh @@ -2,6 +2,6 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" sh $LUSTRE/tests/parallel-scale-nfs.sh 4 diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh index c82a302..28da3f2 100644 --- a/lustre/tests/parallel-scale.sh +++ b/lustre/tests/parallel-scale.sh @@ -2,7 +2,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$PARALLEL_SCALE_EXCEPT " diff --git a/lustre/tests/performance-sanity.sh b/lustre/tests/performance-sanity.sh index c4004ff..f7c2fa8 100644 --- a/lustre/tests/performance-sanity.sh +++ b/lustre/tests/performance-sanity.sh @@ -6,7 +6,7 @@ LOG=${LOG:-"$TMP/${TESTNAME}.log"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$PERFORMANCE_SANITY_EXCEPT " diff --git a/lustre/tests/posix.sh b/lustre/tests/posix.sh index 58ef6a3..0b8ba61 100755 --- a/lustre/tests/posix.sh +++ b/lustre/tests/posix.sh @@ -5,7 +5,7 @@ ONLY=${ONLY:-"$*"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$POSIX_EXCEPT" diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh index e6ba4d0..5cb0369 100755 --- a/lustre/tests/replay-ost-single.sh +++ b/lustre/tests/replay-ost-single.sh @@ -4,7 +4,7 @@ set -e LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging # bug number for skipped test: diff --git a/lustre/tests/replay-single-lmv.sh b/lustre/tests/replay-single-lmv.sh index 63ec67a..8b88f07 100755 --- a/lustre/tests/replay-single-lmv.sh +++ b/lustre/tests/replay-single-lmv.sh @@ -4,7 +4,7 @@ set -e LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" # bug number for skipped test: ALWAYS_EXCEPT="REPLAY_SINGLE_LMV_EXCEPT " diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index 47989b8..11176e8 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -4,7 +4,7 @@ set -e LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$REPLAY_SINGLE_EXCEPT " diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh index 2c785c4..f85f96a 100755 --- a/lustre/tests/replay-vbr.sh +++ b/lustre/tests/replay-vbr.sh @@ -6,7 +6,7 @@ MOUNT_2=${MOUNT_2:-"yes"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging remote_mds_nodsh && log "SKIP: remote MDS with nodsh" && exit 0 diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh index abe5075..3f9ee4c 100644 --- a/lustre/tests/run-llog.sh +++ b/lustre/tests/run-llog.sh @@ -2,7 +2,7 @@ LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" TMP=${TMP:-/tmp} diff --git a/lustre/tests/sanity-benchmark.sh b/lustre/tests/sanity-benchmark.sh index 35a58fc..532576c 100644 --- a/lustre/tests/sanity-benchmark.sh +++ b/lustre/tests/sanity-benchmark.sh @@ -10,7 +10,7 @@ ONLY=${ONLY:-"$*"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$SANITY_BENCHMARK_EXCEPT" diff --git a/lustre/tests/sanity-lsnapshot.sh b/lustre/tests/sanity-lsnapshot.sh index ef5b30e..233c9aa 100755 --- a/lustre/tests/sanity-lsnapshot.sh +++ b/lustre/tests/sanity-lsnapshot.sh @@ -10,7 +10,7 @@ ONLY=${ONLY:-"$*"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$SANITY_LSNAPSHOT_EXCEPT " diff --git a/lustre/tests/sanity-pcc.sh b/lustre/tests/sanity-pcc.sh index 30ca063..a1b1072 100644 --- a/lustre/tests/sanity-pcc.sh +++ b/lustre/tests/sanity-pcc.sh @@ -22,7 +22,7 @@ HSMTOOL_ARCHIVE_FORMAT=v1 LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} init_logging diff --git a/lustre/tests/sanity-pfl.sh b/lustre/tests/sanity-pfl.sh index 81d25da..0d49ea6 100644 --- a/lustre/tests/sanity-pfl.sh +++ b/lustre/tests/sanity-pfl.sh @@ -8,7 +8,7 @@ ONLY=${ONLY:-"$*"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging # bug number for skipped test: diff --git a/lustre/tests/sanity-selinux.sh b/lustre/tests/sanity-selinux.sh index 90b5b9c..4427a2e 100755 --- a/lustre/tests/sanity-selinux.sh +++ b/lustre/tests/sanity-selinux.sh @@ -18,7 +18,7 @@ ONLY=${ONLY:-"$*"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$SANITY_SELINUX_EXCEPT" diff --git a/lustre/tests/scrub-performance.sh b/lustre/tests/scrub-performance.sh index 00e38cb..75f521c 100644 --- a/lustre/tests/scrub-performance.sh +++ b/lustre/tests/scrub-performance.sh @@ -6,7 +6,7 @@ ONLY=${ONLY:-"$*"} LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$SCRUB_PERFORMANCE_EXCEPT" diff --git a/lustre/tests/sgpdd-survey.sh b/lustre/tests/sgpdd-survey.sh index b2c1e23..0cdc0ca 100644 --- a/lustre/tests/sgpdd-survey.sh +++ b/lustre/tests/sgpdd-survey.sh @@ -4,7 +4,7 @@ set -e LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh -init_test_env $@ +init_test_env "$@" init_logging ALWAYS_EXCEPT="$SGPDD_SURVEY_EXCEPT" -- 1.8.3.1