Overview
| Comment: | Refactored nested cond in run queue processing into proc runs:process-expanded-tests |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | dev |
| Files: | files | file ages | folders |
| SHA1: |
0f3b47c2b4587f27a5b80fa3096fccf8 |
| User & Date: | matt on 2013-06-26 01:18:47 |
| Other Links: | branch diff | manifest | tags |
Context
|
2013-06-26
| ||
| 09:46 | Cleaned up runs:expand-items check-in: d3dab825b6 user: mrwellan tags: dev | |
| 01:18 | Refactored nested cond in run queue processing into proc runs:process-expanded-tests check-in: 0f3b47c2b4 user: matt tags: dev | |
| 01:03 | Refactored nested cond in run:tests to a proc runs:expand-items check-in: 6f312dd5f5 user: matt tags: dev | |
Changes
Modified dashboard.scm from [130b7aaa06] to [bcb9c3f528].
| ︙ | ︙ | |||
602 603 604 605 606 607 608 | #:size "150x150" #:expand "YES" #:scrollbar "YES" #:posx "0.5" #:posy "0.5"))))))) | | | | | 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 | #:size "150x150" #:expand "YES" #:scrollbar "YES" #:posx "0.5" #:posy "0.5"))))))) ;; (trace dashboard:populate-target-dropdown ;; common:list-is-sublist) ;; ;; ;; key1 key2 key3 ... ;; ;; target entry (wild cards allowed) ;; ;; ;; The action ;; (iup:hbox ;; ;; label Action | action selector ;; )) |
| ︙ | ︙ |
Modified runs.scm from [5cf026b1f8] to [3077567ff2].
| ︙ | ︙ | |||
406 407 408 409 410 411 412 |
(cons hed reruns))))))
(else
(debug:print 4 "ERROR: No handler for this condition.")
;; TRY (thread-sleep! (+ 1 *global-delta*))
(set! loop-list (list (car newtal)(cdr newtal) reg reruns)))) ;; END OF IF CAN RUN MORE
loop-list))
| | | 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 |
(cons hed reruns))))))
(else
(debug:print 4 "ERROR: No handler for this condition.")
;; TRY (thread-sleep! (+ 1 *global-delta*))
(set! loop-list (list (car newtal)(cdr newtal) reg reruns)))) ;; END OF IF CAN RUN MORE
loop-list))
(define (runs:process-expanded-tests hed tal reg reruns reglen regfull test-record runname test-name item-path jobgroup max-concurrent-jobs run-id waitons item-path testmode test-patts required-tests test-registry registry-mutex flags keyvals run-info)
(let* ((run-limits-info (runs:can-run-more-tests jobgroup max-concurrent-jobs)) ;; look at the test jobgroup and tot jobs running
;; (open-run-close runs:can-run-more-tests #f jobgroup max-concurrent-jobs)) ;; look at the test jobgroup and tot jobs running
(have-resources (car run-limits-info))
(num-running (list-ref run-limits-info 1))
(num-running-in-jobgroup (list-ref run-limits-info 2))
(max-concurrent-jobs (list-ref run-limits-info 3))
(job-group-limit (list-ref run-limits-info 4))
|
| ︙ | ︙ | |||
645 646 647 648 649 650 651 | ;; items is #f then the test is ok to be handed off to launch (but not before) ;; ((not items) (debug:print-info 4 "OUTER COND: (not items)") (if (and (not (tests:match test-patts (tests:testqueue-get-testname test-record) item-path required: required-tests)) (not (null? tal))) (loop (car tal)(cdr tal) reg reruns)) | | | 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 | ;; items is #f then the test is ok to be handed off to launch (but not before) ;; ((not items) (debug:print-info 4 "OUTER COND: (not items)") (if (and (not (tests:match test-patts (tests:testqueue-get-testname test-record) item-path required: required-tests)) (not (null? tal))) (loop (car tal)(cdr tal) reg reruns)) (let ((loop-list (runs:process-expanded-tests hed tal reg reruns reglen regfull test-record runname test-name item-path jobgroup max-concurrent-jobs run-id waitons item-path testmode test-patts required-tests test-registry registry-mutex flags keyvals run-info))) (apply loop loop-list))) ;; case where an items came in as a list been processed ((and (list? items) ;; thus we know our items are already calculated (not itemdat)) ;; and not yet expanded into the list of things to be done (debug:print-info 4 "INNER COND: (and (list? items)(not itemdat))") (if (and (debug:debug-mode 1) ;; (>= *verbosity* 1) |
| ︙ | ︙ |