From: ccooper <ccooper>
Date: Wed, 24 Dec 2003 16:15:27 +0000 (+0000)
Subject: - ability to skip O_DIRECT tests on O_DIRECT-deficient systems (LLNL)
X-Git-Tag: 1.0.2~14
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=2afd8466abb25fa51b555f7a393a7fef84052eec;p=fs%2Flustre-release.git

- ability to skip O_DIRECT tests on O_DIRECT-deficient systems (LLNL)
---

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 4d0efbb0..c086e95 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -66,6 +66,9 @@ for NAME in $CONFIGS; do
 		sh llrmount.sh
 	fi
 	IOZONE_OPTS="-i 0 -i 1 -i 2 -+d -r $RSIZE -s $SIZE"
+	if [ "$O_DIRECT" -a  "$O_DIRECT" != "no" ]; then
+	    IOZONE_OPTS="-I $IOZONE_OPTS"
+	fi
 	IOZONE_FILE="-f $MOUNT/iozone"
 	if [ "$IOZONE" != "no" ]; then
 		mount | grep $MOUNT || sh llmount.sh
@@ -82,7 +85,7 @@ for NAME in $CONFIGS; do
 		[ $THREADS -lt $IOZ_THREADS ] && IOZ_THREADS=$THREADS
 
 		$DEBUG_OFF
-		iozone -I $IOZONE_OPTS $IOZONE_FILE.odir
+		iozone $IOZONE_OPTS $IOZONE_FILE.odir
 		IOZVER=`iozone -v | awk '/Revision:/ { print $3 }' | tr -d '.'`
 		$DEBUG_ON
 		sh llmountcleanup.sh
@@ -95,7 +98,7 @@ for NAME in $CONFIGS; do
 				IOZONE_FILE="$IOZONE_FILE $MOUNT/iozone.$THREAD"
 				THREAD=`expr $THREAD + 1`
 			done
-			iozone -I $IOZONE_OPTS -t $IOZ_THREADS $IOZONE_FILE
+			iozone $IOZONE_OPTS -t $IOZ_THREADS $IOZONE_FILE
 			$DEBUG_ON
 			sh llmountcleanup.sh
 			sh llrmount.sh