Overview
| Comment: | Couple minor improvemts to the launch loop and db calls |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | test-specific-db |
| Files: | files | file ages | folders |
| SHA1: |
d7e5bba15565c8eee3dff01645171c2e |
| User & Date: | mrwellan on 2012-10-04 14:09:20 |
| Other Links: | branch diff | manifest | tags |
Context
|
2012-10-04
| ||
| 15:42 | cleaned up simplerun test case check-in: 51699c5ffe user: mrwellan tags: test-specific-db | |
| 14:09 | Couple minor improvemts to the launch loop and db calls check-in: d7e5bba155 user: mrwellan tags: test-specific-db | |
| 13:31 | Reworked the launch loop to fix a bug in re-running already launched tests (not yet validated) check-in: d9b1c49d16 user: mrwellan tags: test-specific-db | |
Changes
Modified db.scm from [b187b28e9e] to [85e60dcc09].
| ︙ | ︙ | |||
879 880 881 882 883 884 885 886 887 888 889 890 891 892 |
;;
(define (db:test-set-rundir! db run-id test-name item-path rundir)
(sqlite3:execute
db
"UPDATE tests SET rundir=? WHERE run_id=? AND testname=? AND item_path=?;"
rundir run-id test-name item-path))
;;
(define (db:test-get-rundir-from-test-id db test-id)
(let ((res (hash-table-ref/default *test-paths* test-id #f)))
(if res
res
(begin
| > > > > > > | 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 |
;;
(define (db:test-set-rundir! db run-id test-name item-path rundir)
(sqlite3:execute
db
"UPDATE tests SET rundir=? WHERE run_id=? AND testname=? AND item_path=?;"
rundir run-id test-name item-path))
(define (db:test-set-rundir-by-test-id! db test-id rundir)
(sqlite3:execute
db
"UPDATE tests SET rundir=? WHERE id=?"
rundir test-id))
;;
(define (db:test-get-rundir-from-test-id db test-id)
(let ((res (hash-table-ref/default *test-paths* test-id #f)))
(if res
res
(begin
|
| ︙ | ︙ |
Modified launch.scm from [58bf7ad049] to [0714961a30].
| ︙ | ︙ | |||
411 412 413 414 415 416 417 |
(if rd rd (conc *toppath* "/runs"))))
(lnkbase (conc linktree "/" target "/" runname))
(lnkpath (conc lnkbase "/" testname))
(lnkpathf (conc lnkpath (if not-iterated "" "/") item-path)))
;; Update the rundir path in the test record for all
| | | 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 |
(if rd rd (conc *toppath* "/runs"))))
(lnkbase (conc linktree "/" target "/" runname))
(lnkpath (conc lnkbase "/" testname))
(lnkpathf (conc lnkpath (if not-iterated "" "/") item-path)))
;; Update the rundir path in the test record for all
(db:test-set-rundir-by-test-id! db test-id lnkpathf)
(debug:print 2 "INFO:\n lnkbase=" lnkbase "\n lnkpath=" lnkpath "\n toptest-path=" toptest-path "\n test-path=" test-path)
(if (not (file-exists? linktree))
(begin
(debug:print 0 "WARNING: linktree did not exist! Creating it now at " linktree)
(create-directory linktree #t))) ;; (system (conc "mkdir -p " linktree))))
;; create the directory for the tests dir links, this is needed no matter what...
|
| ︙ | ︙ |
Modified runs.scm from [00ebda2af4] to [a54f46b638].
| ︙ | ︙ | |||
413 414 415 416 417 418 419 | (debug:print 1 "INFO: no resources to run new tests, waiting ...") ;; could have done hed tal here but doing car/cdr of newtal to rotate tests (loop (car newtal)(cdr newtal) reruns)) ((and have-resources (or (null? prereqs-not-met) (and (eq? testmode 'toplevel) (null? non-completed)))) | < > | 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 | (debug:print 1 "INFO: no resources to run new tests, waiting ...") ;; could have done hed tal here but doing car/cdr of newtal to rotate tests (loop (car newtal)(cdr newtal) reruns)) ((and have-resources (or (null? prereqs-not-met) (and (eq? testmode 'toplevel) (null? non-completed)))) (run:test run-id runname keyvallst test-record flags #f) (thread-sleep! *global-delta*) (if (not (null? tal)) (loop (car tal)(cdr tal) reruns))) (else ;; must be we have unmet prerequisites (debug:print 4 "FAILS: " fails) ;; If one or more of the prereqs-not-met are FAIL then we can issue ;; a message and drop hed from the items to be processed. (if (null? fails) |
| ︙ | ︙ |