Index: runs-inc.scm
==================================================================
--- runs-inc.scm
+++ runs-inc.scm
@@ -145,59 +145,10 @@
 					(if (and itempath
 						 (not (equal? itempath "")))
 					    (conc "/" itempath)
 					    ""))))))
 
-(define (set-item-env-vars itemdat)
-  (for-each (lambda (item)
-	      (debug:print 2 *default-log-port* "setenv " (car item) " " (cadr item))
-	      (setenv (car item) (cadr item)))
-	    itemdat))
-
-;; Every time can-run-more-tests is called increment the delay
-;;
-;; NOTE: We run this server-side!! Do not use this global except in the runs:can-run-more-tests routine
-;;
-(define *last-num-running-tests* 0)
-;; (define *runs:can-run-more-tests-count* 0)
-(define (runs:shrink-can-run-more-tests-count runsdat)
-  (runs:dat-can-run-more-tests-count-set! runsdat 0))
-
-(define (runs:inc-can-run-more-tests-count runsdat)
-  (runs:dat-can-run-more-tests-count-set!
-   runsdat
-   (+ (runs:dat-can-run-more-tests-count runsdat) 1)))
-
-;;  (set! *runs:can-run-more-tests-count* 0)) ;; (/ *runs:can-run-more-tests-count* 2)))
-
-;; Temporary globals. Move these into the logic or into common
-;;
-(define *seen-cant-run-tests* (make-hash-table)) ;; use to track tests that we suspect cannot be run
-(define (runs:inc-cant-run-tests testname)
-  (hash-table-set! *seen-cant-run-tests* testname
-		   (+ (hash-table-ref/default *seen-cant-run-tests* testname 0) 1)))
-
-(define (runs:can-keep-running? testname n)
-  (< (hash-table-ref/default *seen-cant-run-tests* testname 0) n))
-
-(define *runs:denoise* (make-hash-table)) ;; key => last-time-ran
-
-;; mechanism to limit printing info to the screen that is repetitive.
-;;
-;; Example: 
-;; (if (runs:lownoise "waiting on tasks" 60)
-;;     (debug:print-info 2 *default-log-port* "waiting for tasks to complete, sleeping briefly ..."))
-;;
-(define (runs:lownoise key waitval)
-  (let ((lasttime (hash-table-ref/default *runs:denoise* key 0))
-	(currtime (current-seconds)))
-    (if (> (- currtime lasttime) waitval)
-	(begin
-	  (hash-table-set! *runs:denoise* key currtime)
-	  #t)
-	#f)))
-
 (define (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)
 
   ;; Take advantage of a good place to exit if running the one-pass methodology
   (if (and (> (runs:dat-can-run-more-tests-count runsdat) 20)
 	   (args:get-arg "-one-pass"))

Index: runsmod.scm
==================================================================
--- runsmod.scm
+++ runsmod.scm
@@ -40,7 +40,56 @@
 
 (defstruct runs:testdat
   hed tal reg reruns  test-record
   test-name item-path jobgroup
   waitons testmode  newtal itemmaps prereqs-not-met)
+
+(define (set-item-env-vars itemdat)
+  (for-each (lambda (item)
+	      (debug:print 2 *default-log-port* "setenv " (car item) " " (cadr item))
+	      (setenv (car item) (cadr item)))
+	    itemdat))
+
+;; Every time can-run-more-tests is called increment the delay
+;;
+;; NOTE: We run this server-side!! Do not use this global except in the runs:can-run-more-tests routine
+;;
+(define *last-num-running-tests* 0)
+;; (define *runs:can-run-more-tests-count* 0)
+(define (runs:shrink-can-run-more-tests-count runsdat)
+  (runs:dat-can-run-more-tests-count-set! runsdat 0))
+
+(define (runs:inc-can-run-more-tests-count runsdat)
+  (runs:dat-can-run-more-tests-count-set!
+   runsdat
+   (+ (runs:dat-can-run-more-tests-count runsdat) 1)))
+
+;;  (set! *runs:can-run-more-tests-count* 0)) ;; (/ *runs:can-run-more-tests-count* 2)))
+
+;; Temporary globals. Move these into the logic or into common
+;;
+(define *seen-cant-run-tests* (make-hash-table)) ;; use to track tests that we suspect cannot be run
+(define (runs:inc-cant-run-tests testname)
+  (hash-table-set! *seen-cant-run-tests* testname
+		   (+ (hash-table-ref/default *seen-cant-run-tests* testname 0) 1)))
+
+(define (runs:can-keep-running? testname n)
+  (< (hash-table-ref/default *seen-cant-run-tests* testname 0) n))
+
+(define *runs:denoise* (make-hash-table)) ;; key => last-time-ran
+
+;; mechanism to limit printing info to the screen that is repetitive.
+;;
+;; Example: 
+;; (if (runs:lownoise "waiting on tasks" 60)
+;;     (debug:print-info 2 *default-log-port* "waiting for tasks to complete, sleeping briefly ..."))
+;;
+(define (runs:lownoise key waitval)
+  (let ((lasttime (hash-table-ref/default *runs:denoise* key 0))
+	(currtime (current-seconds)))
+    (if (> (- currtime lasttime) waitval)
+	(begin
+	  (hash-table-set! *runs:denoise* key currtime)
+	  #t)
+	#f)))
 
 )