Overview
Comment: | Merged in changes from v1.55 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.60 |
Files: | files | file ages | folders |
SHA1: |
484834d6b9e3ee10325b04f7bd07aac3 |
User & Date: | matt on 2014-07-24 00:11:04 |
Other Links: | branch diff | manifest | tags |
Context
2014-07-24
| ||
23:07 | Fixed typo check-in: 539477fb97 user: mrwellan tags: v1.60 | |
00:11 | Merged in changes from v1.55 check-in: 484834d6b9 user: matt tags: v1.60 | |
00:04 | test4 will use -run-wait rather than -preclean check-in: 28ec0ec411 user: matt tags: v1.55 | |
2014-07-23
| ||
11:34 | Fixed wrong params to mt:test-set-state-status-by-id check-in: 365a3b603e user: mrwellan tags: v1.60 | |
Changes
Modified db.scm from [03103a45b9] to [cfaa3845d9].
︙ | ︙ | |||
1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 | (sqlite3:for-each-row (lambda (count) (set! res count)) ;; select * from tests where run_id=1 and uname = 'n/a' and item_path=''; (db:get-db dbstruct run-id) "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '');" run-id) res)) (define (db:get-count-tests-running-in-jobgroup dbstruct run-id jobgroup) (if (not jobgroup) 0 ;; (let ((res 0) (testnames '())) ;; get the testnames (sqlite3:for-each-row | > > > > > > > > > > > > > > > > > > | 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 | (sqlite3:for-each-row (lambda (count) (set! res count)) ;; select * from tests where run_id=1 and uname = 'n/a' and item_path=''; (db:get-db dbstruct run-id) "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '');" run-id) res)) ;; override states to count with list of strings. ;; (define (db:get-count-tests-running-for-run-id -blah db run-id states) (let ((res 0) (sqrystr (conc "SELECT count(id) FROM tests WHERE state in ('" (if states (string-intersperse states "','") "RUNNING','LAUNCHED','REMOTEHOSTSTART") "') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '');"))) (sqlite3:for-each-row (lambda (count) (set! res count)) ;; select * from tests where run_id=1 and uname = 'n/a' and item_path=''; db sqrystr run-id) ;; "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '');" run-id) res)) (define (db:get-count-tests-running-in-jobgroup dbstruct run-id jobgroup) (if (not jobgroup) 0 ;; (let ((res 0) (testnames '())) ;; get the testnames (sqlite3:for-each-row |
︙ | ︙ |
Modified megatest.scm from [1c83282f36] to [c57363ff90].
︙ | ︙ | |||
1238 1239 1240 1241 1242 1243 1244 | (exit)) (set! *didsomething* #t))) ;;====================================================================== ;; Wait on a run to complete ;;====================================================================== | | > | 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 | (exit)) (set! *didsomething* #t))) ;;====================================================================== ;; Wait on a run to complete ;;====================================================================== (if (and (args:get-arg "-run-wait") (not (args:get-arg "-runtests"))) ;; run-wait is built into runtests now (begin (if (not (launch:setup-for-run)) (begin (debug:print 0 "Failed to setup, exiting") (exit 1))) (operate-on 'run-wait) (set! *didsomething* #t))) |
︙ | ︙ |
Modified runs.scm from [a5491384b8] to [e1c3bce35c].
︙ | ︙ | |||
1032 1033 1034 1035 1036 1037 1038 | ((not (null? tal)) (debug:print-info 4 "I'm pretty sure I shouldn't get here.")) ((not (null? reg)) ;; could we get here with leftovers? (debug:print-info 0 "Have leftovers!") (loop (car reg)(cdr reg) '() reruns)) (else (debug:print-info 4 "Exiting loop with...\n hed=" hed "\n tal=" tal "\n reruns=" reruns)) | > > > > > > > > > | < | 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 | ((not (null? tal)) (debug:print-info 4 "I'm pretty sure I shouldn't get here.")) ((not (null? reg)) ;; could we get here with leftovers? (debug:print-info 0 "Have leftovers!") (loop (car reg)(cdr reg) '() reruns)) (else (debug:print-info 4 "Exiting loop with...\n hed=" hed "\n tal=" tal "\n reruns=" reruns)) )) ;; now *if* -run-wait we wait for all tests to be done (let loop ((num-running (cdb:remote-run db:get-count-tests-running-for-run-id #f run-id #f))) (if (and (args:get-arg "-run-wait") (> num-running 0)) (begin (debug:print-info 0 "-run-wait specified, waiting on " num-running " tests in RUNNING, REMOTEHOSTSTART or LAUNCHED state.") (thread-sleep! 15) (loop (cdb:remote-run db:get-count-tests-running-for-run-id #f run-id #f))))) ) ;; LET* ((test-record ;; we get here on "drop through". All done! (debug:print-info 1 "All tests launched"))) (define (runs:calc-fails prereqs-not-met) (filter (lambda (test) (and (vector? test) ;; not (string? test)) (equal? (db:test-get-state test) "COMPLETED") |
︙ | ︙ |
Modified tests/Makefile from [064a05bbe1] to [4113b64b3f].
︙ | ︙ | |||
56 57 58 59 60 61 62 | test3b : @echo Run all_toplevel and all waitons cd fullrun;$(MEGATEST) -preclean -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_c test4 : cleanprep @echo "WARNING: No longer running fullprep, test converage may be lessened" | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | test3b : @echo Run all_toplevel and all waitons cd fullrun;$(MEGATEST) -preclean -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_c test4 : cleanprep @echo "WARNING: No longer running fullprep, test converage may be lessened" cd fullrun;time $(MEGATEST) -debug $(DEBUG) -run-wait -runtests % -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING) test4a : cleanprep cd fullrun;time $(MEGATEST) -debug $(DEBUG) -preclean -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING) # NOTE: Only one instance can be a server test5 : cleanprep @echo "WARNING: No longer running fullprep, test converage may be lessened" |
︙ | ︙ |
Modified tests/fdktestqa/fdk.config from [2fcf75c346] to [7490ab5767].
1 2 3 4 | [fields] SYSTEM TEXT RELEASE TEXT | | | > < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | [fields] SYSTEM TEXT RELEASE TEXT [env-override] MAX_ALLOWED_LOAD 200 [setup] # Adjust max_concurrent_jobs to limit how much you load your machines # max_concurrent_jobs 150 max_concurrent_jobs 150 # This is your link path, you can move it but it is generally better to keep it stable linktree #{shell readlink -f #{getenv PWD}/../simplelinks} [include testqa/configs/megatest.abc.config] timeout 0.025 [server] timeout 1 |
Modified tests/fdktestqa/testqa/configs/megatest.abc.config from [b0c9fe881b] to [568ec796ea].
1 2 3 4 5 6 7 | # Valid values for state and status for steps, NB// It is not recommended you use this [validvalues] state start end completed # Job tools are more advanced ways to control how your jobs are launched [jobtools] useshell yes | < | 1 2 3 4 5 6 7 8 9 | # Valid values for state and status for steps, NB// It is not recommended you use this [validvalues] state start end completed # Job tools are more advanced ways to control how your jobs are launched [jobtools] useshell yes [include megatest.def.config] |