From 1c1ffaca57b9ec0831cee1f13dc94d826d269e7f Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Thu, 20 Feb 2020 16:47:12 +0300 Subject: [PATCH] LU-13271 tests: skip 87, 115 tests if FILESET set When FILESET is set the tests require Lustre root mounted on $MOUNT are to be skipped. Test-Parameters: trivial testlist=conf-sanity envdefinitions="FILESET=/subdir" envdefinitions=ONLY=87 Test-Parameters: testlist=conf-sanity envdefinitions="FILESET=/subdir" envdefinitions=ONLY=115 Signed-off-by: Elena Gryaznova Reviewed-by: Vladimir Saveliev Reviewed-by: Alexander Boyko Change-Id: I8931d0419d3613caf53497c99ad8185dc2b56fad Reviewed-on: https://review.whamcloud.com/37647 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Vladimir Saveliev --- lustre/tests/conf-sanity.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 0ca6ce9..fcdd734 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -6283,6 +6283,7 @@ test_87() { #LU-6544 skip "ldiskfs only test" [[ $OSTCOUNT -gt 59 ]] && skip "Ignore wide striping situation" + [ -n "$FILESET" ] && skip "Not functional for FILESET set" local mdsdev=$(mdsdevname 1) local mdsvdev=$(mdsvdevname 1) @@ -8340,6 +8341,7 @@ test_115() { if [ "$mds1_FSTYPE" != ldiskfs ]; then skip "Only applicable to ldiskfs-based MDTs" fi + [ -n "$FILESET" ] && skip "Not functional for FILESET set" local dbfs_ver=$(do_facet $SINGLEMDS $DEBUGFS -V 2>&1) -- 1.8.3.1