Index: megatest-version.scm ================================================================== --- megatest-version.scm +++ megatest-version.scm @@ -1,7 +1,7 @@ ;; Always use two digit decimal ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. (declare (unit megatest-version)) -(define megatest-version 1.5408) +(define megatest-version 1.5409) Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -31,11 +31,11 @@ (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "megatest-fossil-hash.scm") -;; (use trace) +;; (use trace dot-locking) ;; (trace ;; thread-sleep! ;; sqlite3:execute ;; sqlite3:for-each-row ;; open-run-close @@ -46,10 +46,15 @@ ;; db:teststep-set-status! ;; tests:test-set-status! ;; cdb:test-set-status-state ;; cdb:client-call ;; tests:check-waiver-eligibility +;; tests:summarize-items +;; db:test-get-logfile-info +;; obtain-dot-lock +;; change-directory +;; cdb:remote-run ;; ) (define help (conc " Megatest, documentation at http://www.kiatoa.com/fossils/megatest Index: tests.scm ================================================================== --- tests.scm +++ tests.scm @@ -352,18 +352,17 @@ (orig-dir (current-directory)) (logf-info (cdb:remote-run db:test-get-logfile-info #f run-id test-name)) (logf (if logf-info (cadr logf-info) #f)) (path (if logf-info (car logf-info) #f))) ;; This query finds the path and changes the directory to it for the test - (set! logf (car logf-info)) (if (directory? path) (begin (debug:print 4 "Found path: " path) (change-directory path)) ;; (set! outputfilename (conc path "/" outputfilename))) (print "No such path: " path)) - (debug:print 1 "summarize-items with logf " logf) + (debug:print 4 "summarize-items with logf " logf ", outputfilename " outputfilename " and force " force) (if (or (equal? logf "logs/final.log") (equal? logf outputfilename) force) (begin (if (obtain-dot-lock outputfilename 1 20 30) ;; retry every second for 20 seconds, call it dead after 30 seconds and steal the lock