From 27b216e427759c60db5d80fbe0896aa60c934d5c Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Wed, 18 Sep 2002 23:25:01 +0000
Subject: [PATCH] Use $TMP variable, if set, for storing temp loopback files.

---
 lustre/tests/local.sh             | 7 ++++---
 lustre/tests/lov.sh               | 9 +++++----
 lustre/tests/mcrlov.sh            | 3 ++-
 lustre/tests/mdcreq.sh            | 3 ++-
 lustre/tests/ostreq.sh            | 3 ++-
 lustre/tests/runregression-brw.sh | 8 +++++---
 lustre/tests/uml.sh               | 7 ++++---
 7 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh
index 8cfec54..6d1f74e 100755
--- a/lustre/tests/local.sh
+++ b/lustre/tests/local.sh
@@ -2,16 +2,17 @@
 
 config=${1:-local.xml}
 
-LMC=${LMC-../utils/lmc}
+LMC=${LMC:-../utils/lmc}
+TMP=${TMP:-/tmp}
 
 # create nodes
 ${LMC} -o $config --node localhost --net localhost tcp || exit 1
 
 # configure mds server
-${LMC} -m $config --format  --node localhost --mds mds1 /tmp/mds1 50000 || exit 2
+${LMC} -m $config --format  --node localhost --mds mds1 $TMP/mds1 50000 || exit 2
 
 # configure ost
-${LMC} -m $config --format --node localhost --ost /tmp/ost1 100000 || exit 3
+${LMC} -m $config --format --node localhost --ost $TMP/ost1 100000 || exit 3
 
 # create client config
 ${LMC} -m $config --node localhost --mtpt /mnt/lustre mds1 OSC_localhost || exit 4
diff --git a/lustre/tests/lov.sh b/lustre/tests/lov.sh
index 3e6588d..5443b1f 100755
--- a/lustre/tests/lov.sh
+++ b/lustre/tests/lov.sh
@@ -3,17 +3,18 @@
 config=${1:-lov.xml}
 
 LMC=../utils/lmc
+TMP=${TMP:-/tmp}
 
 # create nodes
 ${LMC} -o $config --node localhost --net localhost tcp 
 
 # configure mds server
-${LMC} -m $config --format --node localhost --mds mds1 /tmp/mds1 50000
+${LMC} -m $config --format --node localhost --mds mds1 $TMP/mds1 50000
 
 # configure ost
-${LMC} -m $config --lov lov1 mds1 4096 0 0
-${LMC} -m $config --node localhost --lov lov1 --ost /tmp/ost1 100000
-${LMC} -m $config --node localhost --lov lov1 --ost /tmp/ost2 100000
+${LMC} -m $config --lov lov1 mds1 65536 0 0
+${LMC} -m $config --node localhost --lov lov1 --ost $TMP/ost1 100000
+${LMC} -m $config --node localhost --lov lov1 --ost $TMP/ost2 100000
 
 # create client config
 ${LMC} -m $config  --node localhost --mtpt /mnt/lustre mds1 lov1
diff --git a/lustre/tests/mcrlov.sh b/lustre/tests/mcrlov.sh
index cd3a880..93f1247 100755
--- a/lustre/tests/mcrlov.sh
+++ b/lustre/tests/mcrlov.sh
@@ -8,6 +8,7 @@ LMC="../utils/lmc -m $config"
 SERVERS="ba-ost-1  ba-ost-2"
 ROUTER=dev5
 MDS=dev7
+TMP=${TMP:-/tmp}
 
 # Elan clients
 CLIENT_LO=dev2
@@ -35,7 +36,7 @@ ${LMC} --node $ROUTER --net `h2elan $ROUTER` elan|| exit 1
 ${LMC} --node $ROUTER --route elan `h2elan $ROUTER` `h2elan $CLIENT_LO` `h2elan $CLIENT_HI` || exit 2
 
 ${LMC} --node $MDS --net `h2elan $MDS` elan || exit 1
-${LMC} --node $MDS --mds mds1 /tmp/mds1 100000 || exit 1
+${LMC} --node $MDS --mds mds1 $TMP/mds1 100000 || exit 1
 ${LMC} --lov lov1 mds1 65536 0 0
 
 ${LMC} --node client --mtpt /mnt/lustre mds1 lov1
diff --git a/lustre/tests/mdcreq.sh b/lustre/tests/mdcreq.sh
index 1e2b780..bd54c96 100644
--- a/lustre/tests/mdcreq.sh
+++ b/lustre/tests/mdcreq.sh
@@ -7,12 +7,13 @@ NETWORK=tcp
 LOCALHOST=localhost
 SERVER=localhost
 PORT=988
+TMP=${TMP:-/tmp}
 
 setup_portals
 setup_lustre
 
 MDSFS=ext2
-new_fs ${MDSFS} /tmp/mds 1000
+new_fs ${MDSFS} $TMP/mds 1000
 MDS=$LOOPDEV
 
 echo 0xffffffff > /proc/sys/portals/debug
diff --git a/lustre/tests/ostreq.sh b/lustre/tests/ostreq.sh
index 48104bf..2d600ca 100644
--- a/lustre/tests/ostreq.sh
+++ b/lustre/tests/ostreq.sh
@@ -5,6 +5,7 @@ SRCDIR="`dirname $0`/"
 
 SERVER=localhost
 PORT=988
+TMP=${TMP:-/tmp}
 
 $ACCEPTOR $PORT
 
@@ -19,7 +20,7 @@ EOF
 
 setup_lustre
 
-tmp_fs ext2 /tmp/fs 10000
+tmp_fs ext2 $TMP/fs 10000
 OBD=${LOOPDEV}
 
 $OBDCTL <<EOF
diff --git a/lustre/tests/runregression-brw.sh b/lustre/tests/runregression-brw.sh
index a8bd6e8..6a615fa 100644
--- a/lustre/tests/runregression-brw.sh
+++ b/lustre/tests/runregression-brw.sh
@@ -4,6 +4,8 @@ export PATH=/sbin:/usr/sbin:$PATH
 SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
+ENDRUN=endrun-`hostname`
+
 OSCNAME="`$OBDCTL device_list 2> /dev/null | awk '/ UP osc / { print $4 }'`"
 
 if [ -z "$OSCNAME" ]; then
@@ -35,9 +37,9 @@ runthreads() {
 
 	$OBDCTL --threads $THR v \$$OSCNAME $DO $CNT $RW $V $PGS $OID || exit 1
 
-	if [ -e endrun ]; then
-		rm endrun
-		echo "exiting because endrun file was found"
+	if [ -e $ENDRUN ]; then
+		rm $ENDRUN
+		echo "exiting because $ENDRUN file was found"
 		exit 0
 	fi
 }
diff --git a/lustre/tests/uml.sh b/lustre/tests/uml.sh
index fad9cfe..81e0bef 100644
--- a/lustre/tests/uml.sh
+++ b/lustre/tests/uml.sh
@@ -2,6 +2,7 @@
 
 config=uml.xml
 LMC=../utils/lmc
+TMP=${TMP:-/tmp}
 
 # create nodes
 ${LMC} -o $config --node uml1 --net uml1 tcp 
@@ -9,12 +10,12 @@ ${LMC} -m $config --node uml2 --net uml2 tcp
 ${LMC} -m $config --node uml3 --net uml3 tcp 
 
 # configure mds server
-${LMC} -m $config  --node uml1 --mds mds1 /tmp/mds1 50000
+${LMC} -m $config  --node uml1 --mds mds1 $TMP/mds1 50000
 
 # configure ost
 ${LMC} -m $config  --lov lov1 mds1 65536 0 0
-${LMC} -m $config  --node uml2 --lov lov1 --ost /tmp/ost1 100000
-${LMC} -m $config  --node uml2 --lov lov1 --ost /tmp/ost2 100000
+${LMC} -m $config  --node uml2 --lov lov1 --ost $TMP/ost1 100000
+${LMC} -m $config  --node uml2 --lov lov1 --ost $TMP/ost2 100000
 # is this needed?
 # ${LMC} -m $config  --node uml2 --mdc MDC_mds1
 
-- 
1.8.3.1