From 14b23d67a71cf2aa0b571553171a0894c73f11e6 Mon Sep 17 00:00:00 2001
From: Jian Yu <jian.yu@intel.com>
Date: Tue, 2 Aug 2016 18:09:50 -0700
Subject: [PATCH 1/1] LU-8473 tests: skip conf-sanity test 41a with separate
 MGT and MDT
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

conf-sanity test 41a is to test “nosvc” and “nomgs” mount options
on a combined MGT/MDT device. It’s not applicable for separate
MGT and MDT configuration. This patch adds codes to check that.

Test-Parameters: trivial combinedmdsmgs=false envdefinitions=ONLY=41a testlist=conf-sanity

Test-Parameters: trivial envdefinitions=ONLY=41a testlist=conf-sanity

Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: I967f63c70953c7c8e5bb296e832ee5335e56f69c
Reviewed-on: http://review.whamcloud.com/21651
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
 lustre/tests/conf-sanity.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 89a945b..78bbc2f 100755
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2810,7 +2810,8 @@ test_41a() { #bug 14134
 		return
 	fi
 
-	local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})
+	combined_mgs_mds ||
+		{ skip "needs combined MGT and MDT device" && return 0; }
 
 	start_mdt 1 -o nosvc -n
 	if [ $MDSCOUNT -ge 2 ]; then
-- 
1.8.3.1