From 95ef6f9a5c8f7eafa3322cdc7f3e59ca15fdd664 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Thu, 29 Aug 2002 01:02:22 +0000
Subject: [PATCH] Exit from XML configs if there is an error.

---
 lustre/tests/llecho.sh  | 8 ++++----
 lustre/tests/llmount.sh | 4 ++--
 lustre/tests/local.sh   | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lustre/tests/llecho.sh b/lustre/tests/llecho.sh
index 95d40f8..e9f9ee5 100644
--- a/lustre/tests/llecho.sh
+++ b/lustre/tests/llecho.sh
@@ -5,12 +5,12 @@ lmc=../utils/lmc
 lconf=../utils/lconf
 
 # create nodes
-$lmc -o $config --node localhost --net localhost tcp 
-$lmc -m $config --node localhost --obdtype=obdecho --ost
+$lmc -o $config --node localhost --net localhost tcp || exit 1
+$lmc -m $config --node localhost --obdtype=obdecho --ost|| exit 2
 # force the osc to be configured (this is normally done when it is mounted)
-$lmc -m $config --node localhost --osc OSC_localhost
+$lmc -m $config --node localhost --osc OSC_localhost|| exit 3
 
-$lconf --gdb $config
+$lconf --gdb $config || exit 4
 
 cat <<EOF
 
diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index 4f9c7aa..db45d8a 100755
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -3,8 +3,8 @@
 LCONF=../utils/lconf
 
 if [ ! -f local.xml ]; then
-   ./local.sh
+   ./local.sh || exit 1
 fi
 
-${LCONF} --reformat --gdb local.xml
+${LCONF} --reformat --gdb local.xml || exit 2
 
diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh
index a1d2ee8..3be79e1 100755
--- a/lustre/tests/local.sh
+++ b/lustre/tests/local.sh
@@ -4,13 +4,13 @@ config=local.xml
 LMC=../utils/lmc
 
 # create nodes
-${LMC} -o $config --node localhost --net localhost tcp 
+${LMC} -o $config --node localhost --net localhost tcp || exit 1
 
 # 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 || exit 2
 
 # configure ost
-${LMC} -m $config --format --node localhost --ost /tmp/ost1 100000
+${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
+${LMC} -m $config --node localhost --mtpt /mnt/lustre mds1 OSC_localhost || exit 4
-- 
1.8.3.1