Overview
| Comment: | Fixed jobgroups (added sensitivity to n/a) and num running |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
7ecb5e5d84fa2a0df6161aad1a334237 |
| User & Date: | mrwellan on 2014-10-16 11:20:49 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-10-16
| ||
| 23:58 | Added kill of -runtests processes if -remove-runs is called with test patt of % check-in: 36d5293a01 user: matt tags: v1.60 | |
| 11:20 | Fixed jobgroups (added sensitivity to n/a) and num running check-in: 7ecb5e5d84 user: mrwellan tags: v1.60 | |
| 00:17 | Jobgroup fix for Tal check-in: 8e0b7f5c8a user: matt tags: v1.60 | |
Changes
Modified db.scm from [454a83df2c] to [3d37442279].
| ︙ | ︙ | |||
1581 1582 1583 1584 1585 1586 1587 | ;; NEW BEHAVIOR: Count tests running in only one run! ;; (define (db:get-count-tests-running dbstruct run-id) (sqlite3:first-result (db:get-db dbstruct run-id) ;; WARNING BUG EDIT ME - merged from v1.55 - not sure what is right here ... | > | | | | 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 |
;; NEW BEHAVIOR: Count tests running in only one run!
;;
(define (db:get-count-tests-running dbstruct run-id)
(sqlite3:first-result
(db:get-db dbstruct run-id)
;; WARNING BUG EDIT ME - merged from v1.55 - not sure what is right here ...
;; AND run_id NOT IN (SELECT id FROM runs WHERE state='deleted')
"SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND NOT (uname = 'n/a' AND item_path = '');"
;; "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=?;"
))
;; NEW BEHAVIOR: Count tests running in only one run!
;;
(define (db:get-count-tests-actually-running dbstruct run-id)
(sqlite3:first-result
(db:get-db dbstruct run-id)
;; WARNING BUG EDIT ME - merged from v1.55 - not sure what is right here ...
|
| ︙ | ︙ | |||
1638 1639 1640 1641 1642 1643 1644 |
jobgroup)
;; get the jobcount NB// EXTEND THIS TO OPPERATE OVER ALL RUNS?
(if (not (null? testnames))
(sqlite3:first-result
(db:get-db dbstruct run-id)
(conc "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND testname in ('"
(string-intersperse testnames "','")
| | | 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 |
jobgroup)
;; get the jobcount NB// EXTEND THIS TO OPPERATE OVER ALL RUNS?
(if (not (null? testnames))
(sqlite3:first-result
(db:get-db dbstruct run-id)
(conc "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND testname in ('"
(string-intersperse testnames "','")
"') AND NOT (uname = 'n/a' AND item_path='');")) ;; should this include the (uname = 'n/a' ...) ???
0))))
;; DEBUG FIXME - need to merge this v.155 query correctly
;; AND testname in (SELECT testname FROM test_meta WHERE jobgroup=?)
;; AND NOT (uname = 'n/a' AND item_path = '');"
;; done with run when:
;; 0 tests in LAUNCHED, NOT_STARTED, REMOTEHOSTSTART, RUNNING
|
| ︙ | ︙ |