From 3951304e03bbfcd1a2536bb308d4cb3932f1949c Mon Sep 17 00:00:00 2001 From: grev Date: Wed, 31 Oct 2007 00:17:36 +0000 Subject: [PATCH] b=13922 i=Nathan skip 32a, 32b tests if MDS is remote --- lustre/tests/conf-sanity.sh | 8 ++++++++ lustre/tests/test-framework.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 21cf30a..460adb2 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -1082,6 +1082,10 @@ 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; } + [ "$ost_HOST" = "`hostname`" -o "$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 @@ -1139,6 +1143,10 @@ 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; } + [ "$ost_HOST" = "`hostname`" -o "$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 17c1435..12e373e 100644 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1145,7 +1145,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() { -- 1.8.3.1