Overview
Comment: | Fixed the issue where runs were blocked by itemized tests where the parent state and status confused megatest |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | experimental |
Files: | files | file ages | folders |
SHA1: |
ca022fd7b5f27cd03ba2cd0bd9f84b75 |
User & Date: | mrwellan on 2011-06-18 15:41:54 |
Other Links: | branch diff | manifest | tags |
Context
2011-06-18
| ||
22:20 | Adding a singletest (i.e. no items) check-in: 5d48bcf740 user: mrwellan tags: experimental | |
15:41 | Fixed the issue where runs were blocked by itemized tests where the parent state and status confused megatest check-in: ca022fd7b5 user: mrwellan tags: experimental | |
13:20 | Added PATH and DISPLAY to nbfake check-in: 6f0c4b417a user: mrwellan tags: experimental | |
Changes
Modified db.scm from [11e94b6a23] to [1e0798cda7].
︙ | |||
214 215 216 217 218 219 220 | 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 | - - - - - - + + + + + + + + + + - | (define (db:delete-test-records db test-id) (sqlite3:execute db "DELETE FROM test_steps WHERE test_id=?;" test-id) (sqlite3:execute db "DELETE FROM tests WHERE id=?;" test-id)) ;; set tests with state currstate and status currstatus to newstate and newstatus ;; use currstate = #f and or currstatus = #f to apply to any state or status respectively ;; WARNING: SQL injection risk |
︙ |
Modified megatest.scm from [641a234d19] to [eedc08b57c].
︙ | |||
48 49 50 51 52 53 54 | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | - + + | -force : override some checks -xterm : start an xterm instead of launching the test -remove-runs : remove the data for a run, requires all fields be specified and :runname ,-testpatt and -itempatt and -testpatt -keepgoing : continue running until no jobs are \"LAUNCHED\" or \"NOT_STARTED\" |
︙ |
Modified runs.scm from [b5df931833] to [8546ef4018].
︙ | |||
311 312 313 314 315 316 317 318 319 320 321 322 | 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 | + - + + | (runconfigf (conc *toppath* "/runconfigs.config"))) (print "items: ")(pp allitems) (if (args:get-arg "-m") (db:set-comment-for-run db run-id (args:get-arg "-m"))) (let loop ((itemdat (car allitems)) (tal (cdr allitems))) ;; (lambda (itemdat) ;;; ((ripeness "overripe") (temperature "cool") (season "summer")) ;; Handle lists of items (let* ((item-path (item-list->path itemdat)) ;; (string-intersperse (map cadr itemdat) "/")) (new-test-path (string-intersperse (cons test-path (map cadr itemdat)) "/")) (new-test-name (if (equal? item-path "") test-name (conc test-name "/" item-path))) ;; just need it to be unique (testdat #f) (num-running (db:get-count-tests-running db)) |
︙ | |||
354 355 356 357 358 359 360 | 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 | - + + + | 'NOT_STARTED (if testdat (string->symbol (test:get-state testdat)) 'failed-to-insert)) ((failed-to-insert) (print "ERROR: Failed to insert the record into the db")) ((NOT_STARTED COMPLETED) |
︙ | |||
381 382 383 384 385 386 387 | 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 | + - + | (set! runflag #f)) ((and (not (args:get-arg "-rerun")) (member (test:get-status testdat) '("FAIL" "n/a"))) (set! runflag #t)) (else (set! runflag #f))) ;; (print "RUNNING => runflag: " runflag " STATE: " (test:get-state testdat) " STATUS: " (test:get-status testdat)) (if (not runflag) (if (not parent-test) |
︙ | |||
433 434 435 436 437 438 439 | 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 | - + | (begin (print "Prerequisites met, launching " testname) ((cadr testdat)) (hash-table-delete! *waiting-queue* testname))) (if (not db) (sqlite3:finalize! ldb)))) waiting-test-names) |
︙ |