Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -191,13 +191,13 @@ tests.o tasks.o dashboard-tasks.o : task_records.scm runs.o : test_records.scm -mofiles-made : $(MOFILES) - make $(MOIMPFILES) - touch mofiles-made +# mofiles-made : $(MOFILES) +# make $(MOIMPFILES) +# touch mofiles-made megatest.o : megatest-fossil-hash.scm megatest-version.scm $(MOFILES) $(MOIMPFILES) rmt.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm megatest-version.scm Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -2775,16 +2775,17 @@ (db:with-db dbstruct run-id #f (lambda (dbdat db) - (let ((res (cons #f #f)) - (stmth (db:get-cache-stmth dbdat db "SELECT state,status FROM tests WHERE id=?;"))) + (let ((res (cons #f #f))) +;; (stmth (db:get-cache-stmth dbdat db "SELECT state,status FROM tests WHERE id=?;"))) (sqlite3:for-each-row ;; attemptnum added to hold pid of top process (not Megatest) controlling a test (lambda (state status) (cons state status)) - stmth + db + "SELECT state,status FROM tests WHERE id=?;" ;; stmth try not compiling this one - yes, this fixed the bind issue test-id) res)))) ;; Use db:test-get* to access ;; Get test data using test_ids. NB// Only works within a single run!! Index: dbfile.scm ================================================================== --- dbfile.scm +++ dbfile.scm @@ -1358,20 +1358,17 @@ (if gotlock (let ((res (proc))) (dbfile:simple-file-release-lock fname) res) (begin - (dbfile:print-err "dbfile:with-simple-file-lock: " fname " is locked by " ) - (with-input-from-file fname - (lambda () - (dbfile:print-err (read-line)))) - (assert #f (conc "ERROR: simple file lock could not get a lock for " fname " in " expire-time " seconds")) - ) - ) - ) -) - + (dbfile:print-err "dbfile:with-simple-file-lock: " fname " is locked by " + (with-input-from-file fname + (lambda () + (dbfile:print-err (read-line))))) + #f) + #;(assert #f (conc "ERROR: simple file lock could not get a lock for " fname " in " expire-time " seconds")) + ))) (define *get-cache-stmth-mutex* (make-mutex)) (define (db:get-cache-stmth dbdat db stmt) (mutex-lock! *get-cache-stmth-mutex*)