Check-in [1ea16b0407]
Not logged in
Overview
SHA1 Hash:1ea16b04079981b1381a0d009fc5faa53036827b
Date: 2011-06-27 21:52:47
User: mrwellan
Comment:Removed queuing behavior when in -keepgoing mode
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | manifest
Tags And Properties
Changes

Modified megatest.scm from [14746c53af9fa95d] to [b78a28ba5c5a919c].

94 "-xterm" 94 "-xterm" 95 "-showkeys" 95 "-showkeys" 96 "-test-status" 96 "-test-status" 97 "-gui" 97 "-gui" 98 "-runall" ;; run all tests 98 "-runall" ;; run all tests 99 "-remove-runs" 99 "-remove-runs" 100 "-keepgoing" 100 "-keepgoing" > 101 "-usequeue" 101 ) 102 ) 102 args:arg-hash 103 args:arg-hash 103 0)) 104 0)) 104 105 105 (if (args:get-arg "-h") 106 (if (args:get-arg "-h") 106 (begin 107 (begin 107 (print help) 108 (print help) ................................................................................................................................................................................ 113 (include "configf.scm") 114 (include "configf.scm") 114 (include "process.scm") 115 (include "process.scm") 115 (include "launch.scm") 116 (include "launch.scm") 116 (include "runs.scm") 117 (include "runs.scm") 117 ;; (include "gui.scm") 118 ;; (include "gui.scm") 118 119 119 (define *didsomething* #f) 120 (define *didsomething* #f) > 121 > 122 ;;====================================================================== > 123 ;; Misc setup stuff > 124 ;;====================================================================== 120 125 121 ;;====================================================================== 126 ;;====================================================================== 122 ;; Remove old run(s) 127 ;; Remove old run(s) 123 ;;====================================================================== 128 ;;====================================================================== 124 129 125 ;; since several actions can be specified on the command line the removal 130 ;; since several actions can be specified on the command line the removal 126 ;; is done first 131 ;; is done first

Modified runs.scm from [b2c0b4b62776bb46] to [b1e1d474d08de862].

77 77 78 (define (register-test db run-id test-name item-path) 78 (define (register-test db run-id test-name item-path) 79 (let ((item-paths (if (equal? item-path "") 79 (let ((item-paths (if (equal? item-path "") 80 (list item-path) 80 (list item-path) 81 (list item-path "")))) 81 (list item-path "")))) 82 (for-each 82 (for-each 83 (lambda (pth) 83 (lambda (pth) 84 (sqlite3:execute db "INSERT OR IGNORE INTO tests (run_id,testname,event_t | 84 (sqlite3:execute db "INSERT OR IGNORE INTO tests (run_id,testname,event_t 85 item-paths))) 85 item-paths))) 86 86 87 ;; (define db (open-db)) 87 ;; (define db (open-db)) 88 ;; (test-set-status! db 2 "runfirst" "COMPLETED" "PASS" "summer") 88 ;; (test-set-status! db 2 "runfirst" "COMPLETED" "PASS" "summer") 89 89 90 (define (test-set-status! db run-id test-name state status itemdat-or-path . com 90 (define (test-set-status! db run-id test-name state status itemdat-or-path . com 91 (let ((item-path (if (string? itemdat-or-path) itemdat-or-path (item-list->pat 91 (let ((item-path (if (string? itemdat-or-path) itemdat-or-path (item-list->pat ................................................................................................................................................................................ 401 (db-get-prereqs-not-met d 401 (db-get-prereqs-not-met d 402 (launch-cmd (lambda () 402 (launch-cmd (lambda () 403 (launch-test db run-id te 403 (launch-test db run-id te 404 (testrundat (list get-prereqs-cmd launc 404 (testrundat (list get-prereqs-cmd launc 405 (if (or (args:get-arg "-force") 405 (if (or (args:get-arg "-force") 406 (null? ((car testrundat)))) ;; are there 406 (null? ((car testrundat)))) ;; are there 407 ((cadr testrundat)) ;; this is the line that 407 ((cadr testrundat)) ;; this is the line that > 408 (if (not (args:get-arg "-keepgoing")) 408 (hash-table-set! *waiting-queue* new-test-nam | 409 (hash-table-set! *waiting-queue* new-test 409 ((KILLED) 410 ((KILLED) 410 (print "NOTE: " new-test-name " is already running or was 411 (print "NOTE: " new-test-name " is already running or was 411 ((LAUNCHED REMOTEHOSTSTART RUNNING) 412 ((LAUNCHED REMOTEHOSTSTART RUNNING) 412 (if (> (- (current-seconds)(+ (db:test-get-event_time tes 413 (if (> (- (current-seconds)(+ (db:test-get-event_time tes 413 (db:test-get-run_duration t 414 (db:test-get-run_duration t 414 100) ;; i.e. no update for more than 100 seconds 415 100) ;; i.e. no update for more than 100 seconds 415 (begin 416 (begin