From b87236a164c78d4273b7f55975ef0b088a5c9269 Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Tue, 30 Oct 2007 21:11:59 +0000
Subject: [PATCH] b=13922 i=Nathan
skip 32a, 32b tests if MDS is remote
---
lustre/tests/conf-sanity.sh | 6 ++++++
lustre/tests/test-framework.sh | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index f451667ce3..2a6a84f8ef 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1094,6 +1094,9 @@ test_32a() {
# there appears to be a lot of assumption here about loopback
# devices
# or maybe this test is just totally useless on a client-only system
+ [ "$mds_HOST" = "`hostname`" ] || { skip "remote MDS" && return 0; }
+ [ "$ost1_HOST" = "`hostname`" ] || { skip "remote OST" && return 0; }
+
[ -z "$TUNEFS" ] && skip "No tunefs" && return
local DISK1_4=$LUSTRE/tests/disk1_4.zip
[ ! -r $DISK1_4 ] && skip "Cant find $DISK1_4, skipping" && return
@@ -1154,6 +1157,9 @@ test_32b() {
# there appears to be a lot of assumption here about loopback
# devices
# or maybe this test is just totally useless on a client-only system
+ [ "$mds_HOST" = "`hostname`" ] || { skip "remote MDS" && return 0; }
+ [ "$ost1_HOST" = "`hostname`" ] || { skip "remote OST" && return 0; }
+
[ -z "$TUNEFS" ] && skip "No tunefs" && return
local DISK1_4=$LUSTRE/tests/disk1_4.zip
[ ! -r $DISK1_4 ] && skip "Cant find $DISK1_4, skipping" && return
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 2cd3049136..00dbe7440a 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1000,7 +1000,7 @@ equals_msg() {
local suffixlen=$((${#EQUALS} - ${#msg}))
[ $suffixlen -lt 5 ] && suffixlen=5
- printf '===== %s %.*s\n' "$msg" $suffixlen $EQUALS
+ log `echo $(printf '===== %s %.*s\n' "$msg" $suffixlen $EQUALS)`
}
log() {
--
GitLab