Check-in [f6681ce535]
Not logged in
Overview
SHA1 Hash:f6681ce5350b1fcb8b21387d2ee9f0e33a55496e
Date: 2012-03-26 10:52:16
User: matt
Comment:Added check for include ... in runconfigs and fixed where -itempatt was not being respected
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | manifest
Tags And Properties
Changes

Modified common.scm from [28e4357992a744da] to [62c7112aab56291c].

62 ((string? val) (string->number val)) 62 ((string? val) (string->number val)) 63 ((symbol? val) (any->number (symbol->string val))) 63 ((symbol? val) (any->number (symbol->string val))) 64 (else #f))) 64 (else #f))) 65 65 66 (define (any->number-if-possible val) 66 (define (any->number-if-possible val) 67 (let ((num (any->number val))) 67 (let ((num (any->number val))) 68 (if num num val))) 68 (if num num val))) > 69 > 70 (define (patt-list-match item patts) > 71 (if (and item patts) ;; here we are filtering for matches with -itempatt > 72 (let ((res #f)) ;; look through all the item-patts if defined, format is > 73 (for-each > 74 (lambda (patt) > 75 (if (string-match (glob->regexp > 76 (string-translate patt "%" "*")) > 77 item) > 78 (set! res #t))) > 79 (string-split patts ",")) > 80 res) > 81 #t)) 69 82 70 ;;====================================================================== 83 ;;====================================================================== 71 ;; System stuff 84 ;; System stuff 72 ;;====================================================================== 85 ;;====================================================================== 73 86 74 (define (get-df path) 87 (define (get-df path) 75 (let* ((df-results (cmd-run->list (conc "df " path))) 88 (let* ((df-results (cmd-run->list (conc "df " path)))

Modified dashboard-tests.scm from [a471ab5603d960ba] to [cdc3b51b1d73ce1d].

344 (run-test (lambda (x) 344 (run-test (lambda (x) 345 (iup:attribute-set! 345 (iup:attribute-set! 346 command-text-box "VALUE" 346 command-text-box "VALUE" 347 (conc "xterm -e \"megatest -runtests " testname " - 347 (conc "xterm -e \"megatest -runtests " testname " - 348 " -itempatt " (if (equal? item-path "") 348 " -itempatt " (if (equal? item-path "") 349 "%" 349 "%" 350 item-path) 350 item-path) 351 "\"")))) | 351 ";echo Press any key to continue;bash -c 'rea 352 (remove-test (lambda (x) 352 (remove-test (lambda (x) 353 (iup:attribute-set! 353 (iup:attribute-set! 354 command-text-box "VALUE" 354 command-text-box "VALUE" 355 (conc "xterm -e \"megatest -remove-runs -target " 355 (conc "xterm -e \"megatest -remove-runs -target " 356 (if (equal? item-path "") 356 (if (equal? item-path "") 357 "%" 357 "%" 358 item-path) 358 item-path) 359 " -v\""))))) | 359 " -v;echo Press any key to continue;bash -c 360 (cond 360 (cond 361 ((not testdat)(begin (print "ERROR: bad test info for " test-id)(exit 361 ((not testdat)(begin (print "ERROR: bad test info for " test-id)(exit 362 ((not rundat)(begin (print "ERROR: found test info but there is a pro 362 ((not rundat)(begin (print "ERROR: found test info but there is a pro 363 (else 363 (else 364 ;; (test-set-status! db run-id test-name state status itemdat) 364 ;; (test-set-status! db run-id test-name state status itemdat) 365 (set! self ; 365 (set! self ; 366 (iup:dialog #:close_cb (lambda (a)(exit)) ; #:expand "YES" 366 (iup:dialog #:close_cb (lambda (a)(exit)) ; #:expand "YES"

Modified runs.scm from [b3a5700d11368071] to [eb30591b8696619e].

290 (let ((have-resources (runs:can-run-more-tests db test-record)) ;; lo 290 (let ((have-resources (runs:can-run-more-tests db test-record)) ;; lo 291 (prereqs-not-met (db:get-prereqs-not-met db run-id waitons item- 291 (prereqs-not-met (db:get-prereqs-not-met db run-id waitons item- 292 ;; Don't know at this time if the test have been launched at some ti 292 ;; Don't know at this time if the test have been launched at some ti 293 ;; i.e. is this a re-launch? 293 ;; i.e. is this a re-launch? 294 (if (and have-resources 294 (if (and have-resources 295 (null? prereqs-not-met)) 295 (null? prereqs-not-met)) 296 ;; no loop - drop though and use the loop at the bottom 296 ;; no loop - drop though and use the loop at the bottom > 297 (if (patt-list-match item-path item-patts) 297 (run:test db run-id runname keyvallst test-record flags #f) | 298 (run:test db run-id runname keyvallst test-record flags #f) > 299 (debug:print 1 "INFO: Skipping " (tests:testqueue-get-testna 298 ;; else the run is stuck, temporarily or permanently 300 ;; else the run is stuck, temporarily or permanently 299 (let ((newtal (append tal (list hed)))) 301 (let ((newtal (append tal (list hed)))) 300 ;; couldn't run, take a breather 302 ;; couldn't run, take a breather 301 (thread-sleep! 0.5) 303 (thread-sleep! 0.5) 302 (loop (car newtal)(cdr newtal)))))) 304 (loop (car newtal)(cdr newtal)))))) 303 305 304 ;; case where an items came in as a list been processed 306 ;; case where an items came in as a list been processed ................................................................................................................................................................................ 313 ;; (print "items: ") (pp (item-assoc->item-list items)) 315 ;; (print "items: ") (pp (item-assoc->item-list items)) 314 ;; (print "itemstable: ")(pp (item-table->item-list itemstable)) 316 ;; (print "itemstable: ")(pp (item-table->item-list itemstable)) 315 (for-each 317 (for-each 316 (lambda (my-itemdat) 318 (lambda (my-itemdat) 317 (let* ((new-test-record (let ((newrec (make-tests:testqueue))) 319 (let* ((new-test-record (let ((newrec (make-tests:testqueue))) 318 (vector-copy! test-record newrec) 320 (vector-copy! test-record newrec) 319 newrec)) 321 newrec)) 320 (my-item-path (item-list->path my-itemdat)) | 322 (my-item-path (item-list->path my-itemdat))) 321 < 322 ;; 3/25/2012 - this match is *always* returning true I belie < 323 ;; < 324 (item-matches (if item-patts ;; here we are filtering < 325 (let ((res #f)) ;; look through all the < 326 (for-each < 327 (lambda (patt) < 328 (if (string-search (glob->regexp < 329 (string-translate < 330 item-path) < 331 (set! res #t))) < 332 (string-split item-patts ",")) < 333 res) < 334 #t))) < 335 (if item-matches ;; yes, we want to process this item | 323 (if (patt-list-match my-item-path item-patts) ;; yes, w 336 (let ((newtestname (conc hed "/" my-item-path))) ;; test n 324 (let ((newtestname (conc hed "/" my-item-path))) ;; test n 337 (tests:testqueue-set-items! new-test-record #f) 325 (tests:testqueue-set-items! new-test-record #f) 338 (tests:testqueue-set-itemdat! new-test-record my-itemdat) 326 (tests:testqueue-set-itemdat! new-test-record my-itemdat) 339 (tests:testqueue-set-item_path! new-test-record my-item-pat 327 (tests:testqueue-set-item_path! new-test-record my-item-pat 340 (hash-table-set! test-records newtestname new-test-record) 328 (hash-table-set! test-records newtestname new-test-record) 341 (set! tal (cons newtestname tal)))))) ;; since these are it 329 (set! tal (cons newtestname tal)))))) ;; since these are it 342 items) 330 items)

Modified tests/Makefile from [293e5d625588afb7] to [b5c15174a8a0cba6].

7 IPADDR := "-" 7 IPADDR := "-" 8 # Set SERVER to "-server -" 8 # Set SERVER to "-server -" 9 SERVER := "" 9 SERVER := "" 10 10 11 runall : test1 test2 11 runall : test1 test2 12 12 13 test1 : cleanprep 13 test1 : cleanprep 14 $(MEGATEST) -runtests ez_pass -target ubuntu/nfs/none :runname $(RUNNAME | 14 $(MEGATEST) -runtests ez_pass -reqtarg ubuntu/nfs/none :runname $(RUNNAM 15 15 16 test2 : cleanprep 16 test2 : cleanprep 17 $(MEGATEST) -runtests runfirst -target ubuntu/nfs/none :runname $(RUNNAM | 17 $(MEGATEST) -runtests runfirst -reqtarg ubuntu/nfs/none :runname $(RUNNA 18 18 19 test3 : cleanprep 19 test3 : cleanprep 20 $(MEGATEST) -runall -target ubuntu/nfs/none :runname $(RUNNAME)_b -m "Th | 20 $(MEGATEST) -runall -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "T 21 21 22 cleanprep : ../*.scm 22 cleanprep : ../*.scm 23 sqlite3 megatest.db "delete from metadat where var='SERVER';" 23 sqlite3 megatest.db "delete from metadat where var='SERVER';" 24 mkdir -p /tmp/mt_runs /tmp/mt_links 24 mkdir -p /tmp/mt_runs /tmp/mt_links 25 cd ..;make 25 cd ..;make 26 @sleep 1 26 @sleep 1 27 @if ps -def |awk '{print $8}'|grep megatest; then \ 27 @if ps -def |awk '{print $8}'|grep megatest; then \

Added tests/common_runconfigs.config version [5be9eb5733c55067]

> 1 [default] > 2 FOOBARBAZZZZ not a useful value > 3 BIGBOB $FOOBARBAZZZZ/bobby > 4 FREDDY $sysname/$fsname > 5 TOMMY [system pwd] > 6 > 7 [/tmp/mrwellan/env/ubuntu/afs] > 8 BOGOUS Bob > 9 > 10 [default/ubuntu/nfs] > 11 CURRENT /blah > 12 > 13 [ubuntu/nfs/none] > 14 CURRENT /tmp/nada > 15

Modified tests/runconfigs.config from [5386d0e9a546a23c] to [9b511fe7d958f37e].

1 [/tmp/mrwellan/env/ubuntu/afs] | 1 [include common_runconfigs.config] 2 BOGOUS Bob < 3 < 4 [default/ubuntu/nfs] < 5 CURRENT /blah < 6 < 7 [ubuntu/nfs/none] < 8 CURRENT /tmp/nada < 9 < 10 < 11 [default] < 12 FOOBARBAZZZZ not a useful value < 13 BIGBOB $FOOBARBAZZZZ/bobby < 14 FREDDY $sysname/$fsname < 15 TOMMY [system pwd] <