@@ -1129,11 +1129,11 @@
      	(configf:config->ini data))
             (else
      	(debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
            (set! *didsomething* #t)
            (pop-directory)
-           (set! *time-to-exit* #t)))
+           (bdat-time-to-exit-set! *bdat* #t)))
      
      (if (args:get-arg "-show-cmdinfo")
          (if (or (args:get-arg ":value")(getenv "MT_CMDINFO"))
      	(let ((data (common:read-encoded-string (or (args:get-arg ":value")(getenv "MT_CMDINFO")))))
      	  (if (equal? (args:get-arg "-dumpmode") "json")
@@ -1406,11 +1406,11 @@
                            (print (string-join (map ->string table-row) ",")))
      
                          
                                  table-rows))))
        (set! *didsomething* #t)
-       (set! *time-to-exit* #t))
+       (bdat-time-to-exit-set! *bdat* #t))
      
      
      
      ;; NOTE: list-runs and list-db-targets operate on local db!!!
      ;;
@@ -1749,15 +1749,15 @@
      					 (conc (current-directory) "/" outputfile)))))
      		  (create-directory tempdir #t)
      		  (ods:list->ods tempdir ouf sheets))))
      	  ;; (system (conc "rm -rf " tempdir))
      	  (set! *didsomething* #t)
-               (set! *time-to-exit* #t)
-               ) ;; end if true branch (end of a let)
-             ) ;; end if
+	  (bdat-time-to-exit-set! *bdat* #t)
+	  ) ;; end if true branch (end of a let)
+	) ;; end if
          ) ;; end if -list-runs
-     
+
      ;; list-waivers
      (if (and (args:get-arg "-list-waivers")
      	 (launch:setup))
          (let* ((runpatt     (or (args:get-arg "-runname") "%"))
      	   (testpatt    (common:args-get-testpatt #f))
@@ -2582,11 +2582,11 @@
      ;; Exit and clean up
      ;;======================================================================
      
      (if (not *didsomething*)
          (debug:print 0 *default-log-port* help)
-         (set! *time-to-exit* #t)
+         (bdat-time-to-exit-set! *bdat* #t)
          )
      ;;(debug:print-info 13 *default-log-port* "thread-join! watchdog")
      
      ;; join the watchdog thread if it has been thread-start!ed  (it may not have been started in the case of a server that never enters running state)
      ;;   (symbols returned by thread-state: created ready running blocked suspended sleeping terminated dead)
@@ -2595,11 +2595,11 @@
        (if (thread? watchdog)
 	   (case (thread-state watchdog)
 	     ((ready running blocked sleeping terminated dead)
 	      (thread-join! watchdog)))))
      
-     (set! *time-to-exit* #t)
+     (bdat-time-to-exit-set! *bdat* #t)
      
      (if (not (eq? *globalexitstatus* 0))
          (if (or (args:get-arg "-run")(args:get-arg "-runtests")(args:get-arg "-runall"))
              (begin
 	       (debug:print 0 *default-log-port* "NOTE: Subprocesses with non-zero exit code detected: " *globalexitstatus*)