From: niu <niu>
Date: Fri, 4 Nov 2005 06:48:50 +0000 (+0000)
Subject: improve test8
X-Git-Tag: v1_7_100~1^103~4^2~244
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0d68d28e68004375f241e1206b33e78b6ee47bbe;p=fs%2Flustre-release.git

improve test8
---

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index f3911c8..8c1e164 100644
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -619,18 +619,22 @@ run_test 7 "Quota recovery (only block limit) ======"
 test_8() {
 	BLK_LIMIT=$((100 * 1024 * 1024)) # 100G
 	FILE_LIMIT=1000000
+	DBENCH_LIB=${DBENCH_LIB:-/usr/lib/dbench}
+	
+	[ ! -d $DBENCH_LIB ] && echo "dbench not installed, skip this test" && return 0
 	
 	echo "  Set enough high limit for user: $TSTUSR"
 	$LFS setquota -u $TSTUSR 0 $BLK_LIMIT 0 $FILE_LIMIT $MOUNT
 	echo "  Set enough high limit for group: $TSTUSR"
 	$LFS setquota -g $USER 0 $BLK_LIMIT 0 $FILE_LIMIT $MOUNT
 	
+
 	TGT=$TSTDIR/client.txt
-	SRC=${SRC:-/usr/lib/dbench/client.txt}
-	[ ! -e $TGT -a -e $SRC ] && echo "  copying $SRC to $TGT" && cp $SRC $TGT
-	SRC=/usr/lib/dbench/client_plain.txt
-	[ ! -e $TGT -a -e $SRC ] && echo "  copying $SRC to $TGT" && cp $SRC $TGT
-	
+	SRC=${SRC:-$DBENCH_LIB/client.txt}
+	[ ! -e $TGT -a -e $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
+	SRC=$DBENCH_LIB/client_plain.txt
+	[ ! -e $TGT -a -e $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
+
 	SAVE_PWD=$PWD
 	cd $TSTDIR
 	$RUNAS dbench -c client.txt 3