From 8767d2e44110fc19e624e963d5ebc788409339d3 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Thu, 19 Jan 2023 23:22:18 -0700 Subject: [PATCH] LU-14692 tests: restore sanity/312 to always_except The sanity test_312 was incorrectly removed from ALWAYS_EXCEPT. Fixes: eaae465556 ("LU-14692 tests: allow FID_SEQ_NORMAL for MDT0000") Test-Parameters: trivial testlist=sanity fstype=zfs Signed-off-by: Andreas Dilger Change-Id: I6e8ed42561809b28fd6d5b4f7ee1104080ebe756 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49720 Reviewed-by: Alex Zhuravlev Reviewed-by: Arshad Hussain Reviewed-by: Li Dongyang Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- lustre/tests/sanity.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 9f7134e..d6058b7 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -63,15 +63,16 @@ if (( $LINUX_VERSION_CODE >= $(version_code 4.18.0) && fi # 5 12 8 12 15 (min)" -[ "$SLOW" = "no" ] && EXCEPT_SLOW="27m 60i 64b 68 71 135 136 230d 300o" +[[ "$SLOW" = "no" ]] && EXCEPT_SLOW="27m 60i 64b 68 71 135 136 230d 300o" -if [ "$mds1_FSTYPE" = "zfs" ]; then +if [[ "$mds1_FSTYPE" == "zfs" ]]; then # 13 (min)" - [ "$SLOW" = "no" ] && EXCEPT_SLOW="$EXCEPT_SLOW 51b" + [[ "$SLOW" == "no" ]] && EXCEPT_SLOW="$EXCEPT_SLOW 51b" fi -if [ "$ost1_FSTYPE" = "zfs" ]; then +if [[ "$ost1_FSTYPE" = "zfs" ]]; then always_except LU-1941 130b 130c 130d 130e 130f 130g + always_except LU-9054 312 fi proc_regexp="/{proc,sys}/{fs,sys,kernel/debug}/{lustre,lnet}/" @@ -24771,8 +24772,7 @@ zfs_object_blksz() { test_312() { # LU-4856 remote_ost_nodsh && skip "remote OST with nodsh" - [ "$ost1_FSTYPE" = "zfs" ] || - skip_env "the test only applies to zfs" + [[ "$ost1_FSTYPE" == "zfs" ]] || skip "the test only applies to zfs" local max_blksz=$(do_facet ost1 \ $ZFS get -p recordsize $(facet_device ost1) | -- 1.8.3.1