Overview
Comment: | Fixed handful of bugs due to inmemdb |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
540d5096fde7163703d410c0a8d83f9e |
User & Date: | matt on 2013-11-18 20:39:43 |
Other Links: | manifest | tags |
Context
2013-11-18
| ||
22:00 | fixed call to tdb:test-data-rollup, removed db placeholder check-in: a5ea19cd4a user: matt tags: trunk | |
20:39 | Fixed handful of bugs due to inmemdb check-in: 540d5096fd user: matt tags: trunk | |
2013-11-17
| ||
09:26 | Removed all the translation stuff that was implemented for json. check-in: 7fe8af32e5 user: matt tags: trunk | |
Changes
Modified db.scm from [6118514997] to [1b5fcc9232].
︙ | ︙ | |||
1499 1500 1501 1502 1503 1504 1505 | (keystr (string-intersperse (map (lambda (key val) (conc key " like '" val "'")) keynames (string-split target "/")) " AND ")) (testqry (tests:match->sqlqry testpatt)) | | > | > > > < | 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 | (keystr (string-intersperse (map (lambda (key val) (conc key " like '" val "'")) keynames (string-split target "/")) " AND ")) (testqry (tests:match->sqlqry testpatt)) (rqry (conc "SELECT id FROM runs WHERE " keystr " AND runname LIKE '" runname "';")) (runsqry (sqlite3:prepare db rqry)) (tqry (conc "SELECT rundir FROM tests WHERE run_id=? AND " testqry " AND state LIKE '" statepatt "' AND status LIKE '" statuspatt "' ORDER BY event_time ASC;")) (tstsqry (sqlite3:prepare db tqry))) (debug:print 8 "db:test-get-paths-matching-keynames-target-new\n rqry=" rqry "\n tqry=" tqry) (sqlite3:for-each-row (lambda (rid) (set! row-ids (cons rid row-ids))) runsqry) (sqlite3:finalize! runsqry) (for-each (lambda (rid) (sqlite3:for-each-row (lambda (p) (set! res (cons p res))) tstsqry rid)) row-ids) (sqlite3:finalize! tstsqry) res)) ;; look through tests from matching runs for a file (define (db:test-get-first-path-matching db keynames target fname) ;; [refpaths] is the section where references to other megatest databases are stored (let ((mt-paths (configf:get-section "refpaths")) (res (db:test-get-paths-matching db keynames target fname))) |
︙ | ︙ |
Modified launch.scm from [f885a90fba] to [ebf7e9a49b].
︙ | ︙ | |||
497 498 499 500 501 502 503 | (if rd rd (conc *toppath* "/runs")))) (lnkbase (conc linktree "/" target "/" runname)) (lnkpath (conc lnkbase "/" testname)) (lnkpathf (conc lnkpath (if not-iterated "" "/") item-path))) ;; Update the rundir path in the test record for all | | | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 | (if rd rd (conc *toppath* "/runs")))) (lnkbase (conc linktree "/" target "/" runname)) (lnkpath (conc lnkbase "/" testname)) (lnkpathf (conc lnkpath (if not-iterated "" "/") item-path))) ;; Update the rundir path in the test record for all (rmt:general-call 'test-set-rundir-by-test-id lnkpathf test-id) (debug:print 2 "INFO:\n lnkbase=" lnkbase "\n lnkpath=" lnkpath "\n toptest-path=" toptest-path "\n test-path=" test-path) (if (not (file-exists? linktree)) (begin (debug:print 0 "WARNING: linktree did not exist! Creating it now at " linktree) (create-directory linktree #t))) ;; (system (conc "mkdir -p " linktree)))) ;; create the directory for the tests dir links, this is needed no matter what... |
︙ | ︙ |
Modified megatest.scm from [8b77573783] to [81796d56c9].
︙ | ︙ | |||
966 967 968 969 970 971 972 | ;; DO NOT put this one into either cdb:remote-run or open-run-close (tdb:load-test-data test-id work-area: work-area)) (if (args:get-arg "-setlog") (let ((logfname (args:get-arg "-setlog"))) (rmt:test-set-log! test-id logfname))) (if (args:get-arg "-set-toplog") ;; DO NOT run remote | | | 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 | ;; DO NOT put this one into either cdb:remote-run or open-run-close (tdb:load-test-data test-id work-area: work-area)) (if (args:get-arg "-setlog") (let ((logfname (args:get-arg "-setlog"))) (rmt:test-set-log! test-id logfname))) (if (args:get-arg "-set-toplog") ;; DO NOT run remote (tests:test-set-toplog! run-id test-name (args:get-arg "-set-toplog"))) (if (args:get-arg "-summarize-items") ;; DO NOT run remote (tests:summarize-items db run-id test-id test-name #t)) ;; do force here (if (args:get-arg "-runstep") (if (null? remargs) (begin (debug:print 0 "ERROR: nothing specified to run!") |
︙ | ︙ |
Modified tests/fullrun/tests/runfirst/main.sh from [2d77d9ebfd] to [f50c79a657].
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 | loadstatus=$? if [[ `basename $PWD` == "mustfail" ]];then $MT_MEGATEST -test-status :state COMPLETED :status FAIL else $MT_MEGATEST -test-status :state COMPLETED :status $loadstatus -m "This is a test level comment" :value 10e6 :expected_value 1.1e6 :tol 100e3 :category nada :variable sillyvar :units mFarks :comment "This is the value/expected comment" fi # $MT_MEGATEST -test-status :state COMPLETED :status FAIL | > > | 28 29 30 31 32 33 34 35 36 37 38 | loadstatus=$? if [[ `basename $PWD` == "mustfail" ]];then $MT_MEGATEST -test-status :state COMPLETED :status FAIL else $MT_MEGATEST -test-status :state COMPLETED :status $loadstatus -m "This is a test level comment" :value 10e6 :expected_value 1.1e6 :tol 100e3 :category nada :variable sillyvar :units mFarks :comment "This is the value/expected comment" fi env > envfile.txt # $MT_MEGATEST -test-status :state COMPLETED :status FAIL |