Made changes so that tinderbox runtest doesnt fail

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index ee22c80..116bf8d 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = $(pkgexample_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) \
        client-echo.cfg    elan-server.cfg  net-client.cfg  obdecho.cfg \
        client-mount.cfg   ldlm.cfg         net-local.cfg   obdfilter.cfg \
        client-mount2.cfg  lustre.cfg       net-server.cfg  sanity.sh \
-       rundbench          mcreate \
+       rundbench          \
        elan-client.cfg    mds.cfg      trivial.sh
 pkgexampledir = '${exec_prefix}/usr/lib/$(PACKAGE)/examples'
 pkgexample_SCRIPTS = llmount.sh llmountcleanup.sh llecho.sh llechocleanup.sh local.sh echo.sh uml.sh lov.sh
@@ -24,10 +24,10 @@ noinst_SCRIPTS += fs.sh intent-test.sh intent-test2.sh leak_finder.pl \
        runtests runvmstat snaprun.sh tbox.sh  common.sh
 noinst_PROGRAMS = openunlink testreq truncate directio openme writeme open_delay
 noinst_PROGRAMS += munlink tchmod toexcl fsx test_brw openclose createdestroy
-noinst_PROGRAMS += stat createmany statmany mkdirmany multifstat createtest
+noinst_PROGRAMS += stat createmany statmany multifstat createtest
 # noinst_PROGRAMS += ldaptest 
 noinst_PROGRAMS += checkstat wantedi
-sbin_PROGRAMS = mcreate
+sbin_PROGRAMS = mcreate mkdirmany
 
 # ldaptest_SOURCES = ldaptest.c
 tchmod_SOURCES = tchmod.c

diff --git a/lustre/tests/runtests b/lustre/tests/runtests
index 05bf71f..9c8f990 100755 (executable)
--- a/lustre/tests/runtests
+++ b/lustre/tests/runtests
@@ -20,6 +20,7 @@ SRC=/etc
 [ "$LCONF" ] || LCONF=$SRCDIR/../utils/lconf
 
 [ "$MCREATE" ] || MCREATE=$SRCDIR/../tests/mcreate
+[ "$MKDIRMANY" ] || MKDIRMANY=$SRCDIR/../tests/mkdirmany
 
 while [ "$1" ]; do
        case $1 in
@@ -106,7 +107,7 @@ rm -r $V $DST || fail "can't remove $DST" 37
 
 # mkdirmany test (bug 589)
 echo "running mkdirmany $OSCMT/base$$ 100"
-./mkdirmany $OSCMT/base$$ 100 || fail "mkdirmany failed"
+$MKDIRMANY $OSCMT/base$$ 100 || fail "mkdirmany failed"
 echo "removing mkdirmany directories"
 rmdir $OSCMT/base$$* || fail "mkdirmany cleanup failed"