conf-sanity 15: some testbed (cnbuild) using source tree but also have

luster installed, which cause confusion of which lconf/lmc/lctl will be
used. We put $LUSTRE/utils and $LUSTRE/tests at the head of $PATH env
to ensure the tools in source tree will be searched at first. This should
not affect the tests by install, but if we got problem we'll back this
commit out.

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index c6eff64..5a2f319 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -624,7 +624,7 @@ test_15() {
        [ ! `cp $LUSTRE/utils/llmount $MOUNTLUSTRE` ] || return $?
        do_node `hostname` mkdir -p $MOUNT 2> /dev/null
        # load llite module on the client if it isn't in /lib/modules
-       do_node `hostname` lconf --nosetup --node client_facet $XMLCONFIG
+       do_node `hostname` $LCONF --nosetup --node client_facet $XMLCONFIG
        do_node `hostname` mount -t lustre -o nettype=$NETTYPE \
                `facet_active_host mds1`:/mds1_svc/client_facet $MOUNT ||return $?
        echo "mount lustre on $MOUNT with $MOUNTLUSTRE: success"

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 190e718..0ef25df 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -317,7 +317,7 @@ do_node() {
        echo "CMD: $HOST $@"
        $PDSH $HOST $LCTL mark "$@" > /dev/null 2>&1 || :
     fi
-    $PDSH $HOST "(PATH=\$PATH:$RLUSTRE/utils:$RLUSTRE/tests; cd $RPWD; sh -c \"$@\")"
+    $PDSH $HOST "(PATH=$RLUSTRE/utils:$RLUSTRE/tests:\$PATH; cd $RPWD; sh -c \"$@\")"
 }
 
 mds_list() {