Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -1338,15 +1338,15 @@ (db:delay-if-busy dbdat) (for-each (lambda (toptest) (let ((test-name (list-ref toptest 3))) ;; (run-id (list-ref toptest 5))) - (db:top-test-set-per-pf-counts db run-id test-name))) + (db:top-test-set-per-pf-counts dbdat run-id test-name))) toplevels))) -(define (db:top-test-set-per-pf-counts db run-id test-name) - (db:general-call db 'top-test-set-per-pf-counts (list test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name))) +(define (db:top-test-set-per-pf-counts dbdat run-id test-name) + (db:general-call dbdat 'top-test-set-per-pf-counts (list test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name))) ;; Clean out old junk and vacuum the database ;; ;; Ultimately do something like this: @@ -2834,15 +2834,16 @@ (db:general-call dbdat 'state-status (list state status test-id))))) ;; call with state = #f to roll up with out accounting for state/status of this item ;; (define (db:roll-up-pass-fail-counts dbstruct run-id test-name item-path state status) - (let ((dbdat (db:get-db dbstruct run-id)) - (db (db:dbdat-get-db dbdat))) - (db:general-call dbdat 'update-pass-fail-counts (list test-name test-name test-name)) - (db:top-test-set-per-pf-counts db run-id test-name))) - + (if (not (equal? item-path "")) + (let ((dbdat (db:get-db dbstruct run-id))) + ;; (db (db:dbdat-get-db dbdat))) + (db:general-call dbdat 'update-pass-fail-counts (list test-name test-name test-name)) + (db:top-test-set-per-pf-counts dbdat run-id test-name)))) + ;; (case (string->symbol status) ;; ((RUNNING) (db:general-call dbdat 'top-test-set-running (list test-name))) ;; ((LAUNCHED) (db:general-call dbdat 'top-test-set (list "LAUNCHED" test-name))) ;; ((ABORT INCOMPLETE) (db:general-call dbdat 'top-test-set (list status test-name)))) @@ -3056,11 +3057,11 @@ stmtname) db:queries))) (if q (car q) #f)))) (db:delay-if-busy dbdat) (apply sqlite3:execute (db:dbdat-get-db dbdat) query params) - #t)) ;; BUG or Sillyness, why do I return #t instead of the query result? + #t)) ;; get a summary of state and status counts to calculate a rollup ;; ;; NOTE: takes a db, not a dbstruct ;; @@ -3093,11 +3094,11 @@ ;;; E D I T M E ! ! (cond - ((> (find "COMPLETED" ".*") #f))))) + ((> (find "COMPLETED" ".*") 0) #f)))) ;; get the previous records for when these tests were run where all keys match but runname ;; NB// Merge this with test:get-previous-test-run-records? This one looks for all matching tests Index: rmt.scm ================================================================== --- rmt.scm +++ rmt.scm @@ -20,11 +20,11 @@ ;; ;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!! ;; ;; ;; For debugging add the following to ~/.megatestrc -;;a +;; ;; (require-library trace) ;; (import trace) ;; (trace ;; rmt:send-receive ;; api:execute-requests