Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -529,11 +529,15 @@ (value (any->number-if-possible (list-ref padded-row 2))) (expected (any->number-if-possible (list-ref padded-row 3))) (tol (any->number-if-possible (list-ref padded-row 4))) ;; >, <, >=, <=, or a number (units (list-ref padded-row 5)) (comment (list-ref padded-row 6)) - (status (list-ref padded-row 7))) ;; if specified on the input then use, else calculate + (status (let ((s (list-ref padded-row 7))) + (if (and (string? s)(or (string-match (regexp "^\\s*$") s) + (string-match (regexp "^n/a$")))) + #f + status)))) ;; if specified on the input then use, else calculate ;; look up expected,tol,units from previous best fit test if they are all either #f or '' (if (and (or (not expected)(equal? expected "")) (or (not tol) (equal? expected "")) (or (not units) (equal? expected ""))) (let-values (((new-expected new-tol new-units)(db:get-prev-tol-for-test db test-id category variable))) Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -219,11 +219,12 @@ (let ((category (hash-table-ref/default otherdat ":category" "")) (variable (hash-table-ref/default otherdat ":variable" "")) (value (hash-table-ref/default otherdat ":value" #f)) (expected (hash-table-ref/default otherdat ":expected" #f)) (tol (hash-table-ref/default otherdat ":tol" #f)) - (units (hash-table-ref/default otherdat ":units" ""))) + (units (hash-table-ref/default otherdat ":units" "")) + (dcomment (hash-table-ref/default otherdat ":comment" ""))) (debug:print 4 "category: " category ", variable: " variable ", value: " value ", expected: " expected ", tol: " tol ", units: " units) (if (and value expected tol) ;; all three required (db:csv->test-data db test-id @@ -231,11 +232,11 @@ variable "," value "," expected "," tol "," units "," - comment ",")))) + dcomment ",")))) ;; need to update the top test record if PASS or FAIL and this is a subtest (if (and (not (equal? item-path "")) (or (equal? status "PASS") (equal? status "WARN")