Overview
Comment: | Added -keepgoing, removed the calls to run-queue, fixes to job limits, -runstep, and killreq (now will do signal/kill after first trying signal/term) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
c075ebd51bcdb34062a39b7c46642be8 |
User & Date: | mrwellan on 2011-06-15 18:11:59 |
Other Links: | manifest | tags |
Context
2011-06-15
| ||
18:31 | For max_concurrent_jobs if there are trailing spaces the string->number fails. Added quotes to make this occurance more obvious check-in: 194bedd45c user: mrwellan tags: trunk | |
18:11 | Added -keepgoing, removed the calls to run-queue, fixes to job limits, -runstep, and killreq (now will do signal/kill after first trying signal/term) check-in: c075ebd51b user: mrwellan tags: trunk | |
2011-06-14
| ||
23:04 | Added filters on test and items to dashboard. Not even close to having real scrolling but it'll have to do for now check-in: a76b6398d6 user: mrwellan tags: trunk | |
Changes
Modified dashboard.scm from [78e2859a5d] to [d72b4fee0f].
︙ | |||
179 180 181 182 183 184 185 | 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | - + | (iup:button "Cancel and close" #:expand "YES" #:action (lambda (x) (hash-table-delete! *examine-test-dat* testkey) (iup:destroy! self)))) ))) (iup:hbox ;; the test steps are tracked here |
︙ | |||
207 208 209 210 211 212 213 | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 | - + | (tests (db-get-tests-for-run *db* run-id testnamepatt itemnamepatt)) (key-vals (get-key-vals *db* run-id))) (if (> (length tests) maxtests) (set! maxtests (length tests))) (set! result (cons (vector run tests key-vals) result)))) runs) (set! *header* header) |
︙ | |||
240 241 242 243 244 245 246 | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 | - + | (update-labels uidat) (for-each (lambda (popup) (let* ((test-id (car popup)) (widgets (hash-table-ref *examine-test-dat* popup)) (stepslbl (hash-table-ref/default widgets "Test Steps" #f))) (if stepslbl |
︙ |
Modified db.scm from [e509962d69] to [6176618730].
︙ | |||
219 220 221 222 223 224 225 226 227 228 229 230 231 232 | 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | + + + + + + + + + + + | (let ((res 0)) (sqlite3:for-each-row (lambda (count) (set! res count)) db "SELECT count(id) FROM tests WHERE state = 'RUNNING' OR state = 'LAUNCHED' OR state = 'REMOTEHOSTSTART';") res)) ;; done with run when: ;; 0 tests in LAUNCHED, NOT_STARTED, REMOTEHOSTSTART, RUNNING (define (db:estimated-tests-remaining db run-id) (let ((res 0)) (sqlite3:for-each-row (lambda (count) (set! res count)) db "SELECT count(id) FROM tests WHERE state in ('LAUNCHED','NOT_STARTED','REMOTEHOSTSTART','RUNNING') AND run_id=?;" run-id) res)) ;; NB// Sync this with runs:get-test-info (define (db:get-test-info db run-id testname item-path) (let ((res '())) (sqlite3:for-each-row (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment) (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run_duration final_logf comment))) |
︙ | |||
270 271 272 273 274 275 276 | 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | - + - + | (define (db-get-test-steps-for-run db test-id) (let ((res '())) (sqlite3:for-each-row (lambda (id test-id stepname state status event-time) (set! res (cons (vector id test-id stepname state status event-time) res))) db |
︙ |
Modified megatest.scm from [7e0b50a664] to [69c49cdbf1].
1 2 3 4 5 6 7 8 9 10 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | - + | ;; Copyright 2006-2011, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. (include "common.scm") |
︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 58 59 | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | + + | Misc -force : override some checks -xterm : start an xterm instead of launching the test -remove-runs : remove the data for a run, requires fields, :runname and -testpatt -testpatt patt : remove tests matching patt (requires -remove-runs) -keepgoing : continue running until no jobs are \"LAUNCHED\" or \"NOT_STARTED\" Helpers -runstep stepname ... : take remaining params as comand and execute as stepname log will be in stepname.log. Best to put command in quotes -logpro file : with -exec apply logpro file to stepname.log, creates stepname.html and sets log to same If using make use stepname_logpro.log as your target |
︙ | |||
88 89 90 91 92 93 94 95 96 97 98 99 100 101 | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | + | "-force" "-xterm" "-showkeys" "-test-status" "-gui" "-runall" ;; run all tests "-remove-runs" "-keepgoing" ) args:arg-hash 0)) (if (args:get-arg "-h") (begin (print help) |
︙ | |||
252 253 254 255 256 257 258 | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 | - + | (print "ERROR: Attempted to run a test but run area config file not found") (exit 1)) ;; put test parameters into convenient variables (let* ((test-names (get-all-legal-tests))) ;; "PROD" is ignored for now (print "INFO: Attempting to start the following tests...") (print " " (string-intersperse test-names ",")) (run-tests db test-names))) |
︙ | |||
293 294 295 296 297 298 299 | 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 | - + | (print "ERROR: Attempted to run a test but run area config file not found") (exit 1)) ;; put test parameters into convenient variables (let* ((test-names (string-split (args:get-arg "-runtests") ","))) (run-tests db test-names))) ;; run-waiting-tests db) (sqlite3:finalize! db) |
︙ | |||
389 390 391 392 393 394 395 | 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 | + + - + + + + + + | (- (current-seconds) start-seconds)))))) (let loop ((minutes (calc-minutes))) (let ((db (open-db))) (set! kill-job? (test-get-kill-request db run-id test-name itemdat)) (test-update-meta-info db run-id test-name itemdat minutes) (if kill-job? (begin |
︙ | |||
500 501 502 503 504 505 506 | 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | - + | (redir (case (string->symbol shell) ((tcsh csh ksh) ">&") ((zsh bash sh ash) "2>&1 >"))) (fullcmd (conc "(" (string-intersperse (cons cmd params) " ") ") " redir " " logfile))) ;; mark the start of the test |
︙ |
Modified runs.scm from [a13e1910a3] to [4be3851e9e].
︙ | |||
248 249 250 251 252 253 254 | 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 | + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + | tests) res)) (define (run-tests db test-names) (let* ((keys (db-get-keys db)) (keyvallst (keys->vallist keys #t)) (run-id (register-run db keys))) ;; test-name))) (let loop ((numtimes 0)) |
︙ | |||
305 306 307 308 309 310 311 | 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 | - + | (test-status #f) (num-running (db:get-count-tests-running db)) (max-concurrent-jobs (config-lookup *configdat* "setup" "max_concurrent_jobs"))) (print "max-concurrent-jobs: " max-concurrent-jobs ", num-running: " num-running) (if (not (or (not max-concurrent-jobs) (and max-concurrent-jobs (string->number max-concurrent-jobs) |
︙ |
Modified tests/Makefile from [4c07feade7] to [0b961aa417].
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | - + | # run some tests MEGATEST=$(shell realpath ../megatest) runall : cd ../;make |
︙ |
Modified tests/megatest.config from [b996a05181] to [7cce1c9833].
1 2 3 4 5 6 7 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | - + | [fields] sysname TEXT fsname TEXT datapath TEXT [setup] # exectutable /path/to/megatest |
︙ |