Add define of LCONF LMC LCTL in replay-dual.sh replay-single.sh replay-ost-single...

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index eabee0a..c74c1b8 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -6,6 +6,9 @@ set -e
 # 3 - bug 1852
 ALWAYS_EXCEPT="3"
 
+LCONF=${LCONF:-"../utils/lconf"}
+LMC=${LMC:-"../utils/lmc"}
+LCTL=${LCTL:-"../utils/lctl"}
 LUSTRE=${LUSTRE:-`dirname $0`/..}
 LTESTDIR=${LTESTDIR:-$LUSTRE/../ltest}
 PATH=$LUSTRE/utils:$LUSTRE/tests:$PATH

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 063218c..176541b 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -22,6 +22,7 @@ init_test_env() {
     [ -d /r ] && export ROOT=/r
     export RLUSTRE=${RLUSTRE:-$LUSTRE}
     export RPWD=${RPWD:-$PWD}
+    export PATH=$PATH:$RLUSTRE/utils:$RLUSTRE/tests
     export PATH=$RLUSTRE/utils:$RLUSTRE/tests:$PATH
     
     export CHECKSTAT="${CHECKSTAT:-checkstat} -v"
@@ -31,24 +32,24 @@ start() {
     facet=$1
     shift
     active=`facet_active $facet`
-    do_facet $facet lconf --select ${facet}1=${active}_facet --node ${active}_facet $@ $XMLCONFIG
+    do_facet $facet $LCONF --select ${facet}1=${active}_facet --node ${active}_facet $@ $XMLCONFIG
 }
 
 stop() {
     facet=$1
     active=`facet_active $facet`
     shift
-    do_facet $facet lconf --select ${facet}1=${active}_facet --node ${active}_facet $@ --cleanup $XMLCONFIG
+    do_facet $facet $LCONF --select ${facet}1=${active}_facet --node ${active}_facet $@ --cleanup $XMLCONFIG
 }
 
 replay_barrier() {
     local facet=$1
     do_facet $facet sync
     df $MOUNT
-    do_facet $facet lctl --device %${facet}1 readonly
-    do_facet $facet lctl --device %${facet}1 notransno
-    do_facet $facet lctl mark "REPLAY BARRIER"
-    lctl mark "REPLAY BARRIER"
+    do_facet $facet $LCTL --device %${facet}1 readonly
+    do_facet $facet $LCTL --device %${facet}1 notransno
+    do_facet $facet $LCTL mark "REPLAY BARRIER"
+    $LCTL mark "REPLAY BARRIER"
 }
 
 mds_evict_client() {
@@ -65,7 +66,7 @@ fail() {
 }
 
 do_lmc() {
-    lmc -m ${XMLCONFIG} $@
+    $LMC -m ${XMLCONFIG} $@
 }
 
 h2tcp() {