Index: tests/Makefile ================================================================== --- tests/Makefile +++ tests/Makefile @@ -23,10 +23,13 @@ all : build unit test1 test2 test3 test4 test5 test6 test7 test8 test9 unit : basicserver.log runs.log misc.log +rel : + cd release;dashboard -rows 25 & + ## basicserver.log : unittests/basicserver.scm ## script -c "./rununittest.sh basicserver $(DEBUG)" basicserver.log %.log : build unittests/%.scm script -c "./rununittest.sh $* $(DEBUG)" $*.log Index: tests/fdktestqa/testqa/Makefile ================================================================== --- tests/fdktestqa/testqa/Makefile +++ tests/fdktestqa/testqa/Makefile @@ -2,11 +2,11 @@ PATH := $(BINDIR):$(PATH) MEGATEST = $(BINDIR)/megatest DASHBOARD = $(BINDIR)/dashboard NEWDASHBOARD = $(BINDIR)/newdashboard RUNNAME = a - +NUMTESTS = 20 all : $(MEGATEST) -remove-runs -target a/b :runname c -testpatt %/% $(MEGATEST) -runtests % -target a/b :runname c @@ -14,17 +14,17 @@ for tn in a b c d;do \ ($(MEGATEST) -runtests % -target a/b :runname $tn & ) ; \ done bigrun : - $(MEGATEST) -runtests bigrun -target a/bigrun :runname a$(shell date +%V) + NUMTESTS=$(NUMTESTS) $(MEGATEST) -runtests bigrun -target a/bigrun :runname a$(shell date +%V) bigrun2 : - $(MEGATEST) -runtests bigrun2 -target a/bigrun2 :runname a$(shell date +%V) + NUMTESTS=$(NUMTESTS) $(MEGATEST) -runtests bigrun2 -target a/bigrun2 :runname a$(shell date +%V) bigrun3 : - $(MEGATEST) -runtests bigrun3 -target a/bigrun3 :runname $(RUNNAME) + NUMTESTS=$(NUMTESTS) $(MEGATEST) -runtests bigrun3 -target a/bigrun3 :runname $(RUNNAME) dashboard : mkdir -p ../simpleruns $(DASHBOARD) -rows 20 & ADDED tests/release/tests/itemwait/testconfig Index: tests/release/tests/itemwait/testconfig ================================================================== --- /dev/null +++ tests/release/tests/itemwait/testconfig @@ -0,0 +1,24 @@ +# test2 from the tests/Makefile + +[var] +tname itemwait + +[prelaunch-env-vars] +NUMTESTS 20 + +[ezsteps] + +# Set things up +clean $MTRUNNER $MTTESTDIR/fdktestqa/testqa $MTPATH megatest -remove-runs -testpatt % -target % -runname #{get var tname}% +runbigrun3 $MTRUNNER $MTTESTDIR/fdktestqa/testqa $MTPATH megatest -run -testpatt bigrun3 -target a/bigrun3 -runname #{get var tname} +# watchrun watches until it sees at least one RUNNING in bigrun and one PASS in bigrun2 +watchrun watchrun.sh #{get var tname} + +[requirements] +# waiton #{getenv ALL_TOPLEVEL_TESTS} + +# This is a "toplevel" test, it does not require waitons to be non-FAIL to run +# mode toplevel + + +# test2 : fullprep ADDED tests/release/tests/itemwait/watchrun.sh Index: tests/release/tests/itemwait/watchrun.sh ================================================================== --- /dev/null +++ tests/release/tests/itemwait/watchrun.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +runname=$1 + +pass=1 +alldone=1 +while ! $alldone;do + sleep 5 + bigrun_running=$(megatest -list-runs a|egrep 'bigrun\(.*RUNNING'|wc -l) + bigrun2_pass=$(megatest -list-runs a|egrep 'bigrun2.*COMPLETED.*PASS') + if [[ $bigrun_running -gt 0 && $bigrun2_pass -gt 0 ]];then + pass=0 + alldone=0 + fi +done + +if $pass;then + echo PASS + exit 0 +else + echo FAIL + exit 1 +fi