From 46f5b98f3f9ce880ed9bfbdeb8504e499174b75f Mon Sep 17 00:00:00 2001 From: grev Date: Fri, 25 Sep 2009 20:00:09 +0000 Subject: [PATCH] b=17873 i=Brian use skip_env instead of skip --- lustre/tests/insanity.sh | 2 +- lustre/tests/large-scale.sh | 6 +++--- lustre/tests/metadata-updates.sh | 2 +- lustre/tests/recovery-small.sh | 2 +- lustre/tests/replay-ost-single.sh | 4 ++-- lustre/tests/replay-vbr.sh | 30 +++++++++++++++--------------- lustre/tests/sanity-quota.sh | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh index 697b371..eb5dd79 100755 --- a/lustre/tests/insanity.sh +++ b/lustre/tests/insanity.sh @@ -288,7 +288,7 @@ run_test 4 "Fourth Failure Mode: OST/MDS `date`" ############### Fifth Failure Mode ############### test_5() { - [ $OSTCOUNT -lt 2 ] && skip "$OSTCOUNT < 2, not enough OSTs" && return 0 + [ $OSTCOUNT -lt 2 ] && skip_env "$OSTCOUNT < 2, not enough OSTs" && return 0 echo "Fifth Failure Mode: OST/OST `date`" diff --git a/lustre/tests/large-scale.sh b/lustre/tests/large-scale.sh index d647684..5acb144 100644 --- a/lustre/tests/large-scale.sh +++ b/lustre/tests/large-scale.sh @@ -18,9 +18,9 @@ init_test_env $@ remote_mds_nodsh && log "SKIP: remote MDS with nodsh" && exit 0 -[ -n "$CLIENTS" ] || { skip "$0: Need two or more clients" && exit 0; } +[ -n "$CLIENTS" ] || { skip_env "$0: Need two or more clients" && exit 0; } [ $CLIENTCOUNT -ge 2 ] || \ - { skip "$0: Need two or more clients, have $CLIENTCOUNT" && exit 0; } + { skip_env "$0: Need two or more remote clients, have $CLIENTCOUNT" && exit 0; } # [ "$SLOW" = "no" ] && EXCEPT_SLOW="" @@ -39,7 +39,7 @@ check_vbr () { } check_vbr || \ - { skip "$0: no version_recovery" && exit 0; } + { skip_env "$0: no version_recovery" && exit 0; } FAKE_NUM_MAX=${FAKE_NUM_MAX:-1000} [ "$SLOW" = "no" ] && FAKE_NUM_MAX=100 diff --git a/lustre/tests/metadata-updates.sh b/lustre/tests/metadata-updates.sh index 1167495..432e96d 100755 --- a/lustre/tests/metadata-updates.sh +++ b/lustre/tests/metadata-updates.sh @@ -250,7 +250,7 @@ if [ -f "$WRITE_DISJOINT" ]; then mpi_run -np $(get_node_count ${NODES_TO_USE//,/ }) -machinefile $MACHINEFILE \ $WRITE_DISJOINT -f $WRITE_DISJOINT_FILE -n $NUMLOOPS || STATUS=1 else - skip "$0 : write_disjoint not found " + skip_env "$0 : write_disjoint not found " fi equals_msg `basename $0`: test complete, cleaning up diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index 94d7532..3085469 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -248,7 +248,7 @@ test_17() { run_test 17 "timeout bulk get, don't evict client (2732)" test_18a() { - [ -z ${ost2_svc} ] && skip "needs 2 osts" && return 0 + [ -z ${ost2_svc} ] && skip_env "needs 2 osts" && return 0 do_facet client mkdir -p $DIR/$tdir f=$DIR/$tdir/$tfile diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh index d3abacb..2292222 100755 --- a/lustre/tests/replay-ost-single.sh +++ b/lustre/tests/replay-ost-single.sh @@ -17,7 +17,7 @@ init_test_env $@ remote_ost_nodsh && skip "remote OST with nodsh" && exit 0 if [ "$FAILURE_MODE" = "HARD" ] && mixed_ost_devs; then - skip "$0: Several ost services on one ost node are used with FAILURE_MODE=$FAILURE_MODE. " + skip_env "$0: Several ost services on one ost node are used with FAILURE_MODE=$FAILURE_MODE. " exit 0 fi @@ -142,7 +142,7 @@ iozone_bg () { } test_5() { - [ -z "`which iozone 2> /dev/null`" ] && skip "iozone missing" && return 0 + [ -z "`which iozone 2> /dev/null`" ] && skip_env "iozone missing" && return 0 # striping is -c 1, get min of available local minavail=$(lctl get_param -n osc.*[oO][sS][cC][-_]*.kbytesavail | sort -n | head -1) diff --git a/lustre/tests/replay-vbr.sh b/lustre/tests/replay-vbr.sh index 836b438..65af2f2 100644 --- a/lustre/tests/replay-vbr.sh +++ b/lustre/tests/replay-vbr.sh @@ -16,9 +16,9 @@ init_test_env $@ . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} -[ -n "$CLIENTS" ] || { skip "Need two or more clients" && exit 0; } +[ -n "$CLIENTS" ] || { skip_env "Need two or more clients" && exit 0; } [ $CLIENTCOUNT -ge 2 ] || \ - { skip "Need two or more clients, have $CLIENTCOUNT" && exit 0; } + { skip_env "Need two or more remote clients, have $CLIENTCOUNT" && exit 0; } remote_mds_nodsh && skip "remote MDS with nodsh" && exit 0 [ "$SLOW" = "no" ] && EXCEPT_SLOW="" @@ -763,7 +763,7 @@ test_3c() { [ "$FAILURE_MODE" = HARD ] || \ { skip "The HARD failure is needed" && return 0; } - [ $RUNAS_ID -eq $UID ] && skip "RUNAS_ID = UID = $UID -- skipping" && return + [ $RUNAS_ID -eq $UID ] && skip_env "RUNAS_ID = UID = $UID -- skipping" && return zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -827,7 +827,7 @@ test_4a() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -860,7 +860,7 @@ test_4b() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -892,7 +892,7 @@ test_4c() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -924,7 +924,7 @@ test_5a() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -956,7 +956,7 @@ test_5b() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -990,7 +990,7 @@ test_6a() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -1029,7 +1029,7 @@ test_7a() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -1062,7 +1062,7 @@ test_8a() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -1089,7 +1089,7 @@ test_8b() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -1116,7 +1116,7 @@ test_8c() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -1143,7 +1143,7 @@ test_8d() { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } remote_server $CLIENT2 || \ - { skip "Client $CLIENT2 is on the server node" && return 0; } + { skip_env "Client $CLIENT2 is on the server node" && return 0; } zconf_mount_clients $CLIENT1 $DIR zconf_mount_clients $CLIENT2 $DIR @@ -1238,7 +1238,7 @@ run_test 8g "create | unlink, create shouldn't fail" test_10 () { delayed_recovery_enabled || { skip "No delayed recovery support"; return 0; } - [ -z "$DBENCH_LIB" ] && skip "DBENCH_LIB is not set" && return 0 + [ -z "$DBENCH_LIB" ] && skip_env "DBENCH_LIB is not set" && return 0 zconf_mount_clients $CLIENTS $DIR diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index bb78b3b..b316864 100644 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -708,7 +708,7 @@ run_test_with_stat 5 "Chown & chgrp successfully even out of block/file quota == # block quota acquire & release test_6() { if [ $OSTCOUNT -lt 2 ]; then - skip "$OSTCOUNT < 2, too few osts" + skip_env "$OSTCOUNT < 2, too few osts" return 0; fi @@ -1095,7 +1095,7 @@ test_12() { chmod 0777 $DIR/$tdir [ "$(grep $DIR2 /proc/mounts)" ] || mount_client $DIR2 || \ - { skip "Need lustre mounted on $MOUNT2 " && retutn 0; } + { skip_env "Need lustre mounted on $MOUNT2 " && retutn 0; } LIMIT=$(( $BUNIT_SZ * $(($OSTCOUNT + 1)) * 10)) # 10 bunits each sever TESTFILE="$DIR/$tdir/$tfile-0" -- 1.8.3.1