Overview
Comment: | Added sleeprunner stuff. Fixed (I hope) the ezsteps bash bug. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.60-ezstesp-bash-fix |
Files: | files | file ages | folders |
SHA1: |
bd1e420f287c767620fb8f33b0d1211a |
User & Date: | matt on 2015-03-24 23:48:23 |
Other Links: | branch diff | manifest | tags |
Context
2015-03-25
| ||
00:26 | Added sleep1 to tests Closed-Leaf check-in: 4d239a9015 user: matt tags: v1.60-ezstesp-bash-fix | |
2015-03-24
| ||
23:48 | Added sleeprunner stuff. Fixed (I hope) the ezsteps bash bug. check-in: bd1e420f28 user: matt tags: v1.60-ezstesp-bash-fix | |
00:23 | ezsteps fix check-in: 9e46ec61db user: matt tags: v1.60-ezstesp-bash-fix | |
Changes
Added bin/sleeprunner version [7ef4797782].
> > > > > > > | 1 2 3 4 5 6 7 | #!/bin/bash if [[ $SLEEPRUNNER == "" ]];then SLEEPRUNNER=1 fi echo "nbfake $@ &> /dev/null" | at now + $SLEEPRUNNER minutes &> /dev/null |
Modified launch.scm from [c50b0e51c3] to [2480988c90].
︙ | ︙ | |||
266 267 268 269 270 271 272 | ;; ;; first source the previous environment ;; (let ((prev-env (conc ".ezsteps/" prevstep (if (string-search (regexp "csh") ;; (get-environment-variable "SHELL")) ".csh" ".sh")))) ;; (if (and prevstep (file-exists? prev-env)) ;; (set! script (conc script "source " prev-env)))) ;; call the command using mt_ezstep | | | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | ;; ;; first source the previous environment ;; (let ((prev-env (conc ".ezsteps/" prevstep (if (string-search (regexp "csh") ;; (get-environment-variable "SHELL")) ".csh" ".sh")))) ;; (if (and prevstep (file-exists? prev-env)) ;; (set! script (conc script "source " prev-env)))) ;; call the command using mt_ezstep (set! script (conc "mt_ezstep " stepname " " (if prevstep prevstep "x") " " stepcmd)) (debug:print 4 "script: " script) (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f) ;; now launch (let ((pid (process-run script))) (rmt:test-set-top-process-pid run-id test-id pid) (let processloop ((i 0)) |
︙ | ︙ |
Modified tests/Makefile from [4ce1c0dba5] to [c9e435d020].
︙ | ︙ | |||
70 71 72 73 74 75 76 | cd fullrun;time $(MEGATEST) -debug $(DEBUG) -preclean -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING) # NOTE: Only one instance can be a server test5 : cleanprep rm -f fullrun/a*.log fullrun/logs/* @echo "WARNING: No longer running fullprep, test converage may be lessened" cd fullrun;sleep 0;$(MEGATEST) -preclean -runtests % -target $(TARGET) :runname $(RUNNAME)_aa -debug $(DEBUG) $(LOGGING) > aa.log 2> aa.log & | | | | | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | cd fullrun;time $(MEGATEST) -debug $(DEBUG) -preclean -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING) # NOTE: Only one instance can be a server test5 : cleanprep rm -f fullrun/a*.log fullrun/logs/* @echo "WARNING: No longer running fullprep, test converage may be lessened" cd fullrun;sleep 0;$(MEGATEST) -preclean -runtests % -target $(TARGET) :runname $(RUNNAME)_aa -debug $(DEBUG) $(LOGGING) > aa.log 2> aa.log & cd fullrun;sleep 0;$(MEGATEST) -preclean -runtests % -target ubuntu/nfs/sleep10 :runname $(RUNNAME)_ab -debug $(DEBUG) $(LOGGING) > ab.log 2> ab.log & cd fullrun;sleep 5;$(MEGATEST) -preclean -runtests % -target ubuntu/nfs/sleep60 :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log & cd fullrun;sleep 8;$(MEGATEST) -preclean -runtests % -target ubuntu/nfs/sleep240 :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log & # cd fullrun;sleep 0;$(MEGATEST) -preclean -runtests % -target $(TARGET) :runname $(RUNNAME)_ae -debug $(DEBUG) $(LOGGING) > ae.log 2> ae.log & # cd fullrun;sleep 0;$(MEGATEST) -preclean -runtests % -target $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log & # MUST ADD THIS BACK IN ASAP!!!! # cd fullrun;sleep 10;$(MEGATEST) -run-wait -target $(TARGET) :runname % -testpatt % :state RUNNING,LAUNCHED,NOT_STARTED,REMOTEHOSTSTART;echo ALL DONE test6: fullprep |
︙ | ︙ |
Modified tests/fullrun/megatest.config from [81e40559f0] to [08287ce2b3].
︙ | ︙ | |||
203 204 205 206 207 208 209 | # <testsuite>/<creationdate> # Within the archive the data is structured like this: # <target>/<runname>/<test>/ disk0 /tmp/#{getenv USER}/adisk1 # Uncomment these to emulate a job queue with a long time (look in bin/sleeprunner for the time) [jobtools] | > | | 203 204 205 206 207 208 209 210 211 | # <testsuite>/<creationdate> # Within the archive the data is structured like this: # <target>/<runname>/<test>/ disk0 /tmp/#{getenv USER}/adisk1 # Uncomment these to emulate a job queue with a long time (look in bin/sleeprunner for the time) [jobtools] launcher #{scheme (if (equal? (getenv "datapath") "none") "nbfake" "sleeprunner")} |
Modified tests/fullrun/runconfigs.config from [ed560fa611] to [c0ab77495b].
︙ | ︙ | |||
24 25 26 27 28 29 30 | [default] SOMEVAR3 #{rget SOMEVAR} SOMEVAR4 #{rget SOMEVAR2} SOMEVAR5 #{runconfigs-get SOMEVAR2} [this/a/test] BLAHFOO 123 | > > > > > > > > > > | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | [default] SOMEVAR3 #{rget SOMEVAR} SOMEVAR4 #{rget SOMEVAR2} SOMEVAR5 #{runconfigs-get SOMEVAR2} [this/a/test] BLAHFOO 123 [ubuntu/nfs/sleep10] SLEEPRUNNER 10 [ubunut/nfs/sleep60] SLEEPRUNNER 60 [ubuntu/nfs/sleep240] SLEEPRUNNER 240 |