From: Eryu Guan Date: Fri, 4 Dec 2020 10:43:53 +0000 (+0530) Subject: check: source common/rc again if TEST_DEV was recreated X-Git-Tag: v2022.05.01~590 X-Git-Url: https://git.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=4767884aff19e042ee3be51c88cf2c27a111707e check: source common/rc again if TEST_DEV was recreated If TEST_DEV is recreated by check, FSTYP derived from TEST_DEV previously could be changed too and might not reflect the reality. So source common/rc again with correct FSTYP to get fs-specific configs, e.g. common/xfs. For example, using this config-section config file, and run section ext4 first then xfs, you can see: our local _scratch_mkfs routine ... ./common/rc: line 825: _scratch_mkfs_xfs: command not found check: failed to mkfs $SCRATCH_DEV using specified options local.config: [default] RECREATE_TEST_DEV=true TEST_DEV=/dev/sda5 SCRATCH_DEV=/dev/sda6 TEST_DIR=/mnt/test SCRATCH_MNT=/mnt/scratch [ext4] MKFS_OPTIONS="-b 4096" FSTYP=ext4 [xfs] FSTYP=xfs MKFS_OPTIONS="-f -b size=4k" Tested-by: Ritesh Harjani Signed-off-by: Eryu Guan Signed-off-by: Ritesh Harjani --- diff --git a/check b/check index 83f6fc8b..c6ad1d6c 100755 --- a/check +++ b/check @@ -630,6 +630,10 @@ function run_section() status=1 exit fi + # TEST_DEV has been recreated, previous FSTYP derived from + # TEST_DEV could be changed, source common/rc again with + # correct FSTYP to get FSTYP specific configs, e.g. common/xfs + . common/rc _prepare_test_list elif [ "$OLD_TEST_FS_MOUNT_OPTS" != "$TEST_FS_MOUNT_OPTS" ]; then _test_unmount 2> /dev/null