X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fconf-sanity.sh;h=57b97c748903b2c4068c88f2aded57ee67654db5;hp=9e5dae17aec37d42a7ee9cfcee5dfbc48f31951f;hb=d574a55778f035691bd3bed621cfcdb8200a9785;hpb=57108489a3eb2ff6fc3994dbda0649ae445d6cb7

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 9e5dae1..57b97c7 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -71,7 +71,7 @@ gen_config() {
 	# and stop to generate the startup logs.
 	start_mds
 	start_ost
-        wait_osc_import_state mds ost FULL
+	wait_osc_import_state mds ost FULL
 	stop_ost
 	stop_mds
 }
@@ -95,7 +95,7 @@ writeconf_or_reformat() {
 }
 
 reformat() {
-        formatall
+	formatall
 }
 
 start_mgs () {
@@ -157,9 +157,9 @@ stop_mds() {
 }
 
 stop_mgs() {
-       echo "stop mgs service on `facet_active_host mgs`"
-       # These tests all use non-failover stop
-       stop mgs -f  || return 97
+	echo "stop mgs service on `facet_active_host mgs`"
+	# These tests all use non-failover stop
+	stop mgs -f  || return 97
 }
 
 start_ost() {
@@ -254,8 +254,8 @@ check_mount() {
 	do_facet client "cp /etc/passwd $DIR/a" || return 71
 	do_facet client "rm $DIR/a" || return 72
 	# make sure lustre is actually mounted (touch will block,
-        # but grep won't, so do it after)
-        do_facet client "grep $MOUNT' ' /proc/mounts > /dev/null" || return 73
+	# but grep won't, so do it after)
+	do_facet client "grep $MOUNT' ' /proc/mounts > /dev/null" || return 73
 	echo "setup single mount lustre success"
 }
 
@@ -4703,6 +4703,10 @@ test_63() {
 		skip "ldiskfs module has not been loaded"
 	fi
 
+	if grep -q "CONFIG_DEBUG_LOCK_ALLOC=y" /boot/config-$(uname -r); then
+		skip "test is not compatible with CONFIG_DEBUG_LOCK_ALLOC=y"
+	fi
+
 	echo "$inode_slab ldiskfs inodes per page"
 	[ "${inode_slab%.*}" -ge "3" ] && return 0