From c367483afeb3f474428b01a0984fa942acf017ea Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Wed, 31 Mar 2004 19:38:09 +0000
Subject: [PATCH] Keep tests in sync with HEAD.

---
 lustre/tests/sanity.sh  | 14 ++++++++++----
 lustre/tests/sanityN.sh |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 149b223..1dd79f5 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -1240,14 +1240,19 @@ stop_kupdated() {
 }
 
 # ensure that all stripes have some grant before we test client-side cache
-for i in `seq -f $DIR/f42-%g 1 $STRIPECOUNT`; do
-	dd if=/dev/zero of=$i bs=4k count=1
-	rm $i
-done
+setup_test42() {
+	[ "$SETUP_TEST42" ] && return
+	for i in `seq -f $DIR/f42-%g 1 $STRIPECOUNT`; do
+		dd if=/dev/zero of=$i bs=4k count=1
+		rm $i
+	done
+	SETUP_TEST42=DONE
+}
 
 # Tests 42* verify that our behaviour is correct WRT caching, file closure,
 # file truncation, and file removal.
 test_42a() {
+	setup_test42
 	cancel_lru_locks OSC
 	stop_kupdated
 	sync; sleep 1; sync # just to be safe
@@ -1262,6 +1267,7 @@ test_42a() {
 run_test 42a "ensure that we don't flush on close =============="
 
 test_42b() {
+	setup_test42
 	cancel_lru_locks OSC
 	stop_kupdated
         sync
diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 756ffdb..f475dda 100644
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -317,7 +317,7 @@ test_14b() {
 run_test 14b "truncate of file being executed should return -ETXTBSY"
 
 test_15() {	# bug 974 - ENOSPC
-	env
+	echo $PATH
 	sh oos2.sh $MOUNT1 $MOUNT2
 }
 run_test 15 "test out-of-space with multiple writers ==========="
-- 
1.8.3.1