Overview
Comment: | Added check for [include ...] in runconfigs and fixed where -itempatt was not being respected |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
f6681ce5350b1fcb8b21387d2ee9f0e3 |
User & Date: | matt on 2012-03-26 10:52:16 |
Other Links: | manifest | tags |
Context
2012-03-26
| ||
20:49 | Removed debug switches from nbfind check-in: ffc00147ea user: matt tags: trunk | |
10:52 | Added check for [include ...] in runconfigs and fixed where -itempatt was not being respected check-in: f6681ce535 user: matt tags: trunk | |
00:39 | Cleaned up output a little check-in: b3c755e579 user: matt tags: trunk | |
Changes
Modified common.scm from [28e4357992] to [62c7112aab].
︙ | ︙ | |||
62 63 64 65 66 67 68 69 70 71 72 73 74 75 | ((string? val) (string->number val)) ((symbol? val) (any->number (symbol->string val))) (else #f))) (define (any->number-if-possible val) (let ((num (any->number val))) (if num num val))) ;;====================================================================== ;; System stuff ;;====================================================================== (define (get-df path) (let* ((df-results (cmd-run->list (conc "df " path))) | > > > > > > > > > > > > > | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | ((string? val) (string->number val)) ((symbol? val) (any->number (symbol->string val))) (else #f))) (define (any->number-if-possible val) (let ((num (any->number val))) (if num num val))) (define (patt-list-match item patts) (if (and item patts) ;; here we are filtering for matches with -itempatt (let ((res #f)) ;; look through all the item-patts if defined, format is patt1,patt2,patt3 ... wildcard is % (for-each (lambda (patt) (if (string-match (glob->regexp (string-translate patt "%" "*")) item) (set! res #t))) (string-split patts ",")) res) #t)) ;;====================================================================== ;; System stuff ;;====================================================================== (define (get-df path) (let* ((df-results (cmd-run->list (conc "df " path))) |
︙ | ︙ |
Modified dashboard-tests.scm from [a471ab5603] to [cdc3b51b1d].
︙ | ︙ | |||
344 345 346 347 348 349 350 | (run-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" (conc "xterm -e \"megatest -runtests " testname " -target " keystring " :runname " runname " -itempatt " (if (equal? item-path "") "%" item-path) | | | | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 | (run-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" (conc "xterm -e \"megatest -runtests " testname " -target " keystring " :runname " runname " -itempatt " (if (equal? item-path "") "%" item-path) ";echo Press any key to continue;bash -c 'read -n 1 -s'\"")))) (remove-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" (conc "xterm -e \"megatest -remove-runs -target " keystring " :runname " runname " -testpatt " testname " -itempatt " (if (equal? item-path "") "%" item-path) " -v;echo Press any key to continue;bash -c 'read -n 1 -s'\""))))) (cond ((not testdat)(begin (print "ERROR: bad test info for " test-id)(exit 1))) ((not rundat)(begin (print "ERROR: found test info but there is a problem with the run info for " run-id)(exit 1))) (else ;; (test-set-status! db run-id test-name state status itemdat) (set! self ; (iup:dialog #:close_cb (lambda (a)(exit)) ; #:expand "YES" |
︙ | ︙ |
Modified runs.scm from [b3a5700d11] to [eb30591b86].
︙ | ︙ | |||
290 291 292 293 294 295 296 | (let ((have-resources (runs:can-run-more-tests db test-record)) ;; look at the test jobgroup and tot jobs running (prereqs-not-met (db:get-prereqs-not-met db run-id waitons item-path))) ;; Don't know at this time if the test have been launched at some time in the past ;; i.e. is this a re-launch? (if (and have-resources (null? prereqs-not-met)) ;; no loop - drop though and use the loop at the bottom | > | > | 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | (let ((have-resources (runs:can-run-more-tests db test-record)) ;; look at the test jobgroup and tot jobs running (prereqs-not-met (db:get-prereqs-not-met db run-id waitons item-path))) ;; Don't know at this time if the test have been launched at some time in the past ;; i.e. is this a re-launch? (if (and have-resources (null? prereqs-not-met)) ;; no loop - drop though and use the loop at the bottom (if (patt-list-match item-path item-patts) (run:test db run-id runname keyvallst test-record flags #f) (debug:print 1 "INFO: Skipping " (tests:testqueue-get-testname test-record) " " item-path " as it doesn't match " item-patts)) ;; else the run is stuck, temporarily or permanently (let ((newtal (append tal (list hed)))) ;; couldn't run, take a breather (thread-sleep! 0.5) (loop (car newtal)(cdr newtal)))))) ;; case where an items came in as a list been processed |
︙ | ︙ | |||
313 314 315 316 317 318 319 | ;; (print "items: ") (pp (item-assoc->item-list items)) ;; (print "itemstable: ")(pp (item-table->item-list itemstable)))) (for-each (lambda (my-itemdat) (let* ((new-test-record (let ((newrec (make-tests:testqueue))) (vector-copy! test-record newrec) newrec)) | | < < < < < < < < < < < < < < | | 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 | ;; (print "items: ") (pp (item-assoc->item-list items)) ;; (print "itemstable: ")(pp (item-table->item-list itemstable)))) (for-each (lambda (my-itemdat) (let* ((new-test-record (let ((newrec (make-tests:testqueue))) (vector-copy! test-record newrec) newrec)) (my-item-path (item-list->path my-itemdat))) (if (patt-list-match my-item-path item-patts) ;; yes, we want to process this item (let ((newtestname (conc hed "/" my-item-path))) ;; test names are unique on testname/item-path (tests:testqueue-set-items! new-test-record #f) (tests:testqueue-set-itemdat! new-test-record my-itemdat) (tests:testqueue-set-item_path! new-test-record my-item-path) (hash-table-set! test-records newtestname new-test-record) (set! tal (cons newtestname tal)))))) ;; since these are itemized create new test names testname/itempath items) |
︙ | ︙ |
Modified tests/Makefile from [293e5d6255] to [b5c15174a8].
1 2 3 4 5 6 7 8 9 10 11 12 13 | # run some tests BINPATH=$(shell realpath ../bin) MEGATEST=$(BINPATH)/megatest PATH := $(BINPATH):$(PATH) RUNNAME := $(shell date +w%V.%u.%H) IPADDR := "-" # Set SERVER to "-server -" SERVER := "" runall : test1 test2 test1 : cleanprep | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | # run some tests BINPATH=$(shell realpath ../bin) MEGATEST=$(BINPATH)/megatest PATH := $(BINPATH):$(PATH) RUNNAME := $(shell date +w%V.%u.%H) IPADDR := "-" # Set SERVER to "-server -" SERVER := "" runall : test1 test2 test1 : cleanprep $(MEGATEST) -runtests ez_pass -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_a $(SERVER) test2 : cleanprep $(MEGATEST) -runtests runfirst -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b $(SERVER) -debug 10 test3 : cleanprep $(MEGATEST) -runall -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(SERVER) cleanprep : ../*.scm sqlite3 megatest.db "delete from metadat where var='SERVER';" mkdir -p /tmp/mt_runs /tmp/mt_links cd ..;make @sleep 1 @if ps -def |awk '{print $8}'|grep megatest; then \ |
︙ | ︙ |
Added tests/common_runconfigs.config version [5be9eb5733].
> > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | [default] FOOBARBAZZZZ not a useful value BIGBOB $FOOBARBAZZZZ/bobby FREDDY $sysname/$fsname TOMMY [system pwd] [/tmp/mrwellan/env/ubuntu/afs] BOGOUS Bob [default/ubuntu/nfs] CURRENT /blah [ubuntu/nfs/none] CURRENT /tmp/nada |
Modified tests/runconfigs.config from [5386d0e9a5] to [9b511fe7d9].
|
| < < | < < < < < < < < < < < < | 1 | [include common_runconfigs.config] |