Overview
Comment: | Pulled in a long lost change to rolling up pass/fail to toplevel tests. Reverted nbfind and added nbload |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.55 | v1.5512 |
Files: | files | file ages | folders |
SHA1: |
dfc126f3ca7c9ca66761b464cba566ef |
User & Date: | mrwellan on 2013-09-19 14:37:25 |
Other Links: | branch diff | manifest | tags |
Context
2013-09-19
| ||
23:22 | Fixed the awful test blocked by prereq with failed prereq bug. Reproduce by running test4 and setting one of the items in sqlitespeed to FAIL, must add a test for this check-in: cfc601732f user: matt tags: v1.55 | |
14:37 | Pulled in a long lost change to rolling up pass/fail to toplevel tests. Reverted nbfind and added nbload check-in: dfc126f3ca user: mrwellan tags: v1.55, v1.5512 | |
2013-09-18
| ||
14:26 | Fix for triggers run command check-in: 8986155833 user: mrwellan tags: v1.55 | |
Changes
Modified db.scm from [3d88d89e84] to [a7b6fe1509].
︙ | ︙ | |||
1647 1648 1649 1650 1651 1652 1653 | WHERE run_id=? AND testname=? AND item_path='';") '(top-test-set-running "UPDATE tests SET state='RUNNING' WHERE run_id=? AND testname=? AND item_path='';") '(top-test-set-per-pf-counts "UPDATE tests SET state=CASE WHEN (SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' | | | 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 | WHERE run_id=? AND testname=? AND item_path='';") '(top-test-set-running "UPDATE tests SET state='RUNNING' WHERE run_id=? AND testname=? AND item_path='';") '(top-test-set-per-pf-counts "UPDATE tests SET state=CASE WHEN (SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND state in ('RUNNING','NOT_STARTED','LAUNCHED','REMOTEHOSTSTART')) > 0 THEN 'RUNNING' ELSE 'COMPLETED' END, status=CASE WHEN fail_count > 0 THEN 'FAIL' WHEN pass_count > 0 AND fail_count=0 THEN 'PASS' WHEN (SELECT count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' |
︙ | ︙ |
Modified tests.scm from [dfe6ddf3ca] to [ed985ac2fe].
︙ | ︙ | |||
558 559 560 561 562 563 564 | (waitons (tests:testqueue-get-waitons test-record)) (keep-test #t) (test-id (cdb:remote-run db:get-test-id #f run-id test-name item-path)) (tdat (cdb:get-test-info-by-id *runremote* test-id))) (if tdat (begin ;; Look at the test state and status | | | > | | > > > > | | | | | 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 | (waitons (tests:testqueue-get-waitons test-record)) (keep-test #t) (test-id (cdb:remote-run db:get-test-id #f run-id test-name item-path)) (tdat (cdb:get-test-info-by-id *runremote* test-id))) (if tdat (begin ;; Look at the test state and status (if (or (and (member (db:test-get-status tdat) '("PASS" "WARN" "WAIVED" "CHECK" "SKIP")) (equal? (db:test-get-state tdat) "COMPLETED")) (member (db:test-get-state tdat) '("INCOMPLETE" "KILLED"))) (set! keep-test #f)) ;; examine waitons for any fails. If it is FAIL or INCOMPLETE then eliminate this test ;; from the runnable list (if keep-test (for-each (lambda (waiton) ;; for now we are waiting only on the parent test (let* ((parent-test-id (cdb:remote-run db:get-test-id #f run-id waiton "")) (wtdat (cdb:get-test-info-by-id *runremote* test-id))) (if (or (and (equal? (db:test-get-state wtdat) "COMPLETED") (member (db:test-get-status wtdat) '("FAIL"))) (member (db:test-get-status wtdat) '("KILLED")) (member (db:test-get-state wtdat) '("INCOMPETE"))) ;; (if (or (member (db:test-get-status wtdat) ;; '("FAIL" "KILLED")) ;; (member (db:test-get-state wtdat) ;; '("INCOMPETE"))) (set! keep-test #f)))) ;; no point in running this one again waitons)))) (if keep-test (set! runnables (cons testkeyname runnables))))) testkeynames) runnables)) ;;====================================================================== |
︙ | ︙ |
Modified txtdb/txtdb.scm from [021f48e586] to [cf8a5ae239].
︙ | ︙ | |||
359 360 361 362 363 364 365 366 367 368 369 | )))))) (define help (conc "Usage: refdb action params ... Note: refdbdir is a path to the directory containg sheet-names.cfg import filename.gnumeric refdbdir : Import a gnumeric file into a txt db directory edit refdbdir : Edit a refdbdir using gnumeric. ls refdbdir : List the keys for specified level lookup refdbdir sheetname row col : Look up a value in the text db getrownames refdb sheetname : Get a list of row titles | > | > > > > > > > | 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 | )))))) (define help (conc "Usage: refdb action params ... Note: refdbdir is a path to the directory containg sheet-names.cfg import filename.gnumeric refdbdir : Import a gnumeric file into a txt db directory export refdbdir filename.gnumeric : Export a refdb to a gnumeric file edit refdbdir : Edit a refdbdir using gnumeric. ls refdbdir : List the keys for specified level lookup refdbdir sheetname row col : Look up a value in the text db getrownames refdb sheetname : Get a list of row titles getcolnames refdb sheetname : Get a list of column titles To export to other formats; first export to gnumeric then use ssconvert. e.g. refdb export mydata mydata.gnumeric ssconvert -T Gnumeric_html:html40 mydata.gnumeric mydata.html Part of the Megatest tool suite. Learn more at http://www.kiatoa.com/fossils/megatest Version: " megatest-fossil-hash)) (define (list-sheets path) ;; (cond ;; ((and path (not sheet)(not row)(not col)) |
︙ | ︙ | |||
463 464 465 466 467 468 469 | ((eq? num-params 1) (case action ((edit) (edit-refdb (car param))) ((ls) (map print (list-sheets (car param)))))) ((eq? num-params 2) | > > | | | | | < < > | 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 | ((eq? num-params 1) (case action ((edit) (edit-refdb (car param))) ((ls) (map print (list-sheets (car param)))))) ((eq? num-params 2) (let ((param1 (car param)) (param2 (cadr param))) (case action ((getrownames) (print (string-intersperse (get-rowcol-names param1 param2 car) " "))) ((getcolnames) (print (string-intersperse (get-rowcol-names param1 param2 cadr) " "))) ((import) (import-gnumeric-file param1 param2)) ;; fname targname ((export) (refdb-export param1 param2)) (else (print "Unrecognised command " action)(print help))))) ((eq? num-params 4) (case action ((lookup) ;; path section row col (let ((res (lookup (car param)(cadr param)(caddr param)(cadddr param)))) (if res (print res) (begin |
︙ | ︙ |
Modified utils/nbfind from [02152a07a2] to [c988ebbbbb].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | #!/bin/bash # load=`uptime|awk '{print $10}'|cut -d, -f1` load=`uptime|perl -pe 's/.*: (\d+.\d+),.*/$1/'` if which cpucheck > /dev/null;then numcpu=`cpucheck|tail -1|awk '{print $6}'` else numcpu=`lscpu|grep "CPU.s.:"|awk '{print $2}'` fi lperc=`echo "100 * $load / $numcpu"|bc` if [[ "x$MAX_ALLOWED_LOAD" == "x" ]]; then max_load=50 else max_load=$MAX_ALLOWED_LOAD fi if [[ $lperc -lt $max_load ]];then | > > > > > | < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | WARNING WARNING WARNING!!! you may not be in a fossil repo area or fossil remote-url is not set to current known repository path use "fsl remote-url " and / or call Justin Gedge 480/552-3393 for help to correct. #!/bin/bash # load=`uptime|awk '{print $10}'|cut -d, -f1` load=`uptime|perl -pe 's/.*: (\d+.\d+),.*/$1/'` if which cpucheck > /dev/null;then numcpu=`cpucheck|tail -1|awk '{print $6}'` else numcpu=`lscpu|grep "CPU.s.:"|awk '{print $2}'` fi lperc=`echo "100 * $load / $numcpu"|bc` if [[ "x$MAX_ALLOWED_LOAD" == "x" ]]; then max_load=50 else max_load=$MAX_ALLOWED_LOAD fi if [[ $lperc -lt $max_load ]];then nbfake "$@" else $NBLAUNCHER "$@" fi |
Added utils/nbload version [02152a07a2].
> > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | #!/bin/bash # load=`uptime|awk '{print $10}'|cut -d, -f1` load=`uptime|perl -pe 's/.*: (\d+.\d+),.*/$1/'` if which cpucheck > /dev/null;then numcpu=`cpucheck|tail -1|awk '{print $6}'` else numcpu=`lscpu|grep "CPU.s.:"|awk '{print $2}'` fi lperc=`echo "100 * $load / $numcpu"|bc` if [[ "x$MAX_ALLOWED_LOAD" == "x" ]]; then max_load=50 else max_load=$MAX_ALLOWED_LOAD fi if [[ $lperc -lt $max_load ]];then echo "$@" | at now + 0 minutes elif [[ "x$NBLAUNCHER" == "x" ]];then echo "nbfind $@" | at now + 2 minutes else $NBLAUNCHER "$@" fi |