Index: tests/release/megatest.config ================================================================== --- tests/release/megatest.config +++ tests/release/megatest.config @@ -9,10 +9,10 @@ # htmlviewercmd firefox -new-window htmlviewercmd arora [jobtools] launcher nbfake -maxload 1.5 +maxload 2.5 [disks] disk0 #{getenv MT_RUN_AREA_HOME}/runs Index: tests/release/runconfigs.config ================================================================== --- tests/release/runconfigs.config +++ tests/release/runconfigs.config @@ -1,6 +1,7 @@ [default] MTRUNNER #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/../../utils/mtrunner} MTTESTDIR #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/..} +MTPATH #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/../../bin} [v1.60/15] Index: tests/release/tests/fullrun/testconfig ================================================================== --- tests/release/tests/fullrun/testconfig +++ tests/release/tests/fullrun/testconfig @@ -1,10 +1,10 @@ [ezsteps] -cleantop $MTRUNNER $MTTESTDIR/fullrun megatest -remove-runs -target ubuntu/nfs/none -runname release_toplevel -testpatt % -runall $MTRUNNER $MTTESTDIR/fullrun megatest -runtests % -target ubuntu/nfs/none -runname release_toplevel -runtop $MTRUNNER $MTTESTDIR/fullrun megatest -runtests all_toplevel -target ubuntu/nfs/none -runname release_toplevel -rerun FAIL -preclean -results $MTRUNNER $MTTESTDIR/fullrun megatest -list-runs release_toplevel -target ubuntu/nfs/none -runname release_toplevel +cleantop $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -remove-runs -target ubuntu/nfs/none -runname release_toplevel -testpatt % +runall $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt % -target ubuntu/nfs/none -runname release_toplevel +runtop $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt all_toplevel -target ubuntu/nfs/none -runname release_toplevel -rerun FAIL -preclean +results $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -list-runs release_toplevel -target ubuntu/nfs/none -runname release_toplevel [requirements] # waiton #{getenv ALL_TOPLEVEL_TESTS} # This is a "toplevel" test, it does not require waitons to be non-FAIL to run Index: tests/release/tests/itempatt/testconfig ================================================================== --- tests/release/tests/itempatt/testconfig +++ tests/release/tests/itempatt/testconfig @@ -1,8 +1,11 @@ [ezsteps] -runtem $MTRUNNER $MTTESTDIR/fullrun megatest -runtests runfirst/%2 -target ubuntu/nfs/none -runname release_itempatt -results $MTRUNNER $MTTESTDIR/fullrun megatest -list-runs release_itempatt -target ubuntu/nfs/none +clean $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -remove-runs -testpatt % -target ubuntu/nfs/none -runname release_itempatt +cleanres $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -list-runs release_itempatt -target ubuntu/nfs/none + +runitems $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt runfirst/%2 -target ubuntu/nfs/none -runname release_itempatt +results $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -list-runs release_itempatt -target ubuntu/nfs/none [requirements] # waiton #{getenv ALL_TOPLEVEL_TESTS} # This is a "toplevel" test, it does not require waitons to be non-FAIL to run Index: tests/release/tests/test2/testconfig ================================================================== --- tests/release/tests/test2/testconfig +++ tests/release/tests/test2/testconfig @@ -1,22 +1,23 @@ # test2 from the tests/Makefile -[vars] +[var] tname test2 +mtpath #{shell readlink -f ../../bin} [ezsteps] -clean $MTRUNNER $MTTESTDIR/fullrun megatest -remove-runs -testpatt % -target ubuntu/nfs/none -runname #{get var tname}% -part1 $MTRUNNER $MTTESTDIR/fullrun megatest -run -testpatt ez_pass,runfirst/a/% -reqtarg ubuntu/nfs/none -runname #{get var tname} -preclean -part2 $MTRUNNER $MTTESTDIR/fullrun megatest -run -testpatt %/,%/ai -reqtarg ubuntu/nfs/none -runname #{get var tname}_a -preclean -part3 $MTRUNNER $MTTESTDIR/fullrun megatest -runtests %/,%/ai -reqtarg ubuntu/nfs/none -runname #{get var tname}_b -preclean -part4 $MTRUNNER $MTTESTDIR/fullrun megatest -run -testpatt runfirst/%,%/ai -reqtarg ubuntu/nfs/none -runname #{get var tname}_a -preclean -part5 $MTRUNNER $MTTESTDIR/fullrun megatest -run -testpatt %/,%/winter -reqtarg ubuntu/nfs/none -runname #{get var tname}_a -preclean -part6 $MTRUNNER $MTTESTDIR/fullrun megatest -set-state-status COMPLETED,FORCED :state COMPLETED :status PASS -testpatt ez_p%s,runfirst/ -target ubuntu/nfs/none -runname #{get var tname} - -results $MTRUNNER $MTTESTDIR/fullrun megatest -list-runs #{get var tname} -target ubuntu/nfs/none -results_a $MTRUNNER $MTTESTDIR/fullrun megatest -list-runs #{get var tname}_a -target ubuntu/nfs/none -results_b $MTRUNNER $MTTESTDIR/fullrun megatest -list-runs #{get var tname}_b -target ubuntu/nfs/none +clean $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -remove-runs -testpatt % -target ubuntu/nfs/none -runname #{get var tname}% +part1 $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt ez_pass,runfirst/a/% -reqtarg ubuntu/nfs/none -runname #{get var tname} -preclean +part2 $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt %/,%/ai -reqtarg ubuntu/nfs/none -runname #{get var tname}_a -preclean +part3 $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -runtests %/,%/ai -reqtarg ubuntu/nfs/none -runname #{get var tname}_b -preclean +part4 $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt runfirst/%,%/ai -reqtarg ubuntu/nfs/none -runname #{get var tname}_a -preclean +part5 $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt %/,%/winter -reqtarg ubuntu/nfs/none -runname #{get var tname}_a -preclean +part6 $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -set-state-status COMPLETED,FORCED :state COMPLETED :status PASS -testpatt ez_p%s,runfirst/ -target ubuntu/nfs/none -runname #{get var tname} + +results $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -list-runs #{get var tname} -target ubuntu/nfs/none +results_a $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -list-runs #{get var tname}_a -target ubuntu/nfs/none +results_b $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -list-runs #{get var tname}_b -target ubuntu/nfs/none [requirements] # waiton #{getenv ALL_TOPLEVEL_TESTS} # This is a "toplevel" test, it does not require waitons to be non-FAIL to run Index: utils/mtrunner ================================================================== --- utils/mtrunner +++ utils/mtrunner @@ -1,11 +1,14 @@ #! /bin/bash # Run megatest from within megatest +# Usage: mtrunner testsuite_dir megatest_bin_dir command args .... for var in $(env | egrep "^MT_"|cut -d= -f1);do unset ${var} done cd $1 shift +export PATH="$1:$PATH" +shift "$@"