Revert my use of the configure_flags macro in the lustre.spec file and just

[fs/lustre-release.git] / lustre / tests / lfscktest_config.sh

diff --git a/lustre/tests/lfscktest_config.sh b/lustre/tests/lfscktest_config.sh
index 45746b2..3fc95c0 100644 (file)
--- a/lustre/tests/lfscktest_config.sh
+++ b/lustre/tests/lfscktest_config.sh
@@ -1,31 +1,16 @@
 export TESTNAME="lfscktest"
 export TESTDESC="Test of lfsck functionality"
 
-export LUSTRE=${LUSTRE:-"../.."}
+export LUSTRE=${LUSTRE:-".."}
 export LCONF=${LCONF:-"$LUSTRE/utils/lconf"}
 export LMC=${LMC:-"$LUSTRE/utils/lmc"}
 export LCTL=${LCTL:-"$LUSTRE/utils/lctl"}
 export LFIND=${LFIND:-"$LUSTRE/utils/lfind"}
-export E2FSCK_PATH=${E2FSCK_PATH:-"/usr/src/e2fsprogs-1.34"}
+
+export LFSCK_PATH=${E2FSCK_PATH:-"/home/yangjun/e2fsprogs-1.35.lfsck2/build/e2fsck"}
 export TMP=${TMP:-"/tmp"}
-export CONFIG=${CONFIG:-"./lfsck_config.sh"}
 export LOG=${LOG:-"${TMP}/lfscktest.log"}
-export CONFIGXML=${CONFIGXML:-"./lfsck_config.xml"}
 export LUSTRE_TAG=${LUSTRE_TAG:="HEAD"}
-export MACHINENAME=`hostname | sed -e 's/[0-9]\+//'`
-export TESTGROUP=${TESTGROUP:-"unspecified"}
-export CONFIGDESC=${CONFIGDESC:-"local"}
-export TESTARCH=${TESTARCH:-`uname -m`}
-export NETWORKTYPE=${NETWORKTYPE:-"tcp"}
-export MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
-export MDSNODES=${MDSNODES:-`hostname`}
-export OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
-export OSTNODES=${OSTNODES:-`hostname`}
-export CLIENTNODES=${CLIENTNODES:-`hostname`}
-export RECIPIENTS=${RECIPIENTS:-"liam.kelleher@hp.com"}
-export SENDER=${SENDER:-"liam.kelleher@hp.com"}
-export NUM_OSTS=${NUM_OSTS:-5}
-export DEBUGFS=${DEBUGFS:-"debugfs"}
 
 export GPATH=`pwd`
 export OST_UUID="OST_localhost_2_UUID"
@@ -34,3 +19,5 @@ export MDS_MOUNTPT="/mnt/mds_${TESTNAME}"
 export OST_MOUNTPT="/mnt/ost_${TESTNAME}"
 export MOUNT="/mnt/lustre"
 export TEST_DIR="${MOUNT}/${TESTNAME}"
+export MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
+export NUM_OSTS=${NUM_OSTS:-1}