Index: archive.scm ================================================================== --- archive.scm +++ archive.scm @@ -68,11 +68,11 @@ (list (vector-ref block 1) ;; archive-area-name (vector-ref block 2))) ;; disk-path existing-blocks))) (or (common:get-disk-with-most-free-space candidate-disks dused) - (archive:allocate-new-archive-block testname itempath)))) + (archive:allocate-new-archive-block #f #f #f)))) ;; BROKEN. testname itempath)))) ;; allocate a new archive area ;; (define (archive:allocate-new-archive-block run-area-home testsuite-name dneeded) (let* ((adisks (archive:get-archive-disks)) Index: configf.scm ================================================================== --- configf.scm +++ configf.scm @@ -352,11 +352,11 @@ (define (configf:get-section cfgdat section) (hash-table-ref/default cfgdat section '())) (define (setup) - (let* ((configf (find-config)) + (let* ((configf (find-config "megatest.config")) (config (if configf (read-config configf #f #t) #f))) (if config (setenv "RUN_AREA_HOME" (pathname-directory configf))) config)) Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -463,18 +463,20 @@ ;; tmptests - new tests data ;; prev-tests - old tests data ;; (define (dashboard:merge-changed-tests tests tmptests use-new prev-tests) - (let ((newdat (filter - (lambda (x) - (not (equal? (db:test-get-state x) "DELETED"))) ;; remove deleted tests but do it after merging - (delete-duplicates (if use-new ;; (dboard:tabdat-filters-changed tabdat) - tmptests - (append tmptests prev-tests)) - (lambda (a b) - (eq? (db:test-get-id a)(db:test-get-id b))))))) + (let ((start-time (current-seconds)) + (newdat (filter + (lambda (x) + (not (equal? (db:test-get-state x) "DELETED"))) ;; remove deleted tests but do it after merging + (delete-duplicates (if use-new ;; (dboard:tabdat-filters-changed tabdat) + tmptests + (append tmptests prev-tests)) + (lambda (a b) + (eq? (db:test-get-id a)(db:test-get-id b))))))) + (print "Time took: " (- (current-seconds) start-time)) (if (eq? *tests-sort-reverse* 3) ;; +event_time (sort newdat dboard:compare-tests) newdat))) ;; this calls dboard:get-tests-for-run-duplicate for each run Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -36,11 +36,11 @@ ;;====================================================================== ;; SQLITE3 HELPERS ;;====================================================================== -(define (db:general-sqlite-error-dump exn stmt run-id params) +(define (db:general-sqlite-error-dump exn stmt . params) (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn))) ;; check for (exn sqlite3) ((condition-property-accessor 'exn 'message) exn) (print "err-status: " err-status) (debug:print-error 0 *default-log-port* " query " stmt " failed, params: " params ", error: " ((condition-property-accessor 'exn 'message) exn)) (print-call-chain (current-error-port)))) Index: tasks.scm ================================================================== --- tasks.scm +++ tasks.scm @@ -529,11 +529,11 @@ (let loop ((count 0) (next-touch 0)) ;; next-touch is the time where we need to update last_update ;; if the db has been modified we'd best look at the task queue (let ((modtime (file-modification-time megatestdbpath ))) (if (> modtime last-db-update) - (tasks:process-queue db mdb last-db-update megatestdb next-touch)) + (tasks:process-queue db)) ;; BROKEN. mdb last-db-update megatestdb next-touch)) ;; WARNING: Possible race conditon here!! ;; should this update be immediately after the task-get-action call above? (if (> (current-seconds) next-touch) (begin (tasks:monitors-update mdb)