@@ -398,11 +398,11 @@
 
     ;; override the number of reruns from the configs
     (if (and config-reruns
 	     (> run-count config-reruns))
 	(set! run-count config-reruns))
-    
+
     ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 
     (let ((sighand (lambda (signum)
 		     ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
 		     (set! *time-to-exit* #t)
@@ -584,16 +584,14 @@
 		     ;; need to account for test-patt here, if I am test "a", selected with a test-patt of "hed/b%"
 		     ;; and we are waiting on "waiton" we need to add "waiton/,waiton/b%" to test-patt
 		     ;; is this satisfied by merely appending "/" to the waiton name added to the list?
 		     ;;
 		     ;; This approach causes all of the items in an upstream test to be run 
-
 		     ;; if we have this waiton already processed once we can analzye it for extending
 		     ;; tests to be run, since we can't properly process waitons unless they have been
 		     ;; initially added we add them again to be processed on second round AND add the hed
 		     ;; back in to also be processed on second round
-		     ;;
 		     (if waiton-tconfig ;; BB: waiter should be in test-patts as well as the waiton have a tconfig.
                          (if waiton-itemized
                              (if waitors-in-testpatt
                                  (begin
                                    (debug:print-info 0 *default-log-port* "New test patts: " new-test-patts ", prev test patts: " test-patts)
@@ -608,15 +606,13 @@
                                (set! required-tests (cons waiton required-tests))
                                (set! test-patts new-test-patts)))
 			 (begin
 			   (debug:print-info 0 *default-log-port* "No testconfig info yet for " waiton ", setting up to re-process it")
 			   (set! tal (append (cons waiton tal)(list hed))))) ;; (cons (conc waiton "/") required-tests))
-			 
 		     ;; NOPE: didn't work. required needs to be plain test names. Try tacking on to test-patts
 		     ;;  - doesn't work
 		     ;; (set! test-patts (conc test-patts "," waiton "/"))
-		     
 		     ;; (set! test-names (cons waiton test-names))))) ;; was an append, now a cons
 		     )))
 	     (delete-duplicates (append waitons waitors)))
 	    (let ((remtests (delete-duplicates (append waitons tal))))
               (debug:print-info 8 *default-log-port* " remtests are "remtests)
@@ -664,13 +660,20 @@
 		  (if (not (hash-table-ref/default flags "-preclean" #f))
 		      (hash-table-set! flags "-preclean" #t))
 		  (if (not (hash-table-ref/default flags "-rerun" #f))
 		      (hash-table-set! flags "-rerun" "STUCK/DEAD,n/a,ZERO_ITEMS"))
 		  ;; recursive call to self
-		  (runs:run-tests target runname test-patts user flags run-count: (- run-count 1)))))
+      (runs:run-tests target runname test-patts user flags run-count: (- run-count 1)))))
 	  (debug:print-info 0 *default-log-port* "No tests to run")))
     (debug:print-info 4 *default-log-port* "All done by here")
+    ;; TODO: try putting post hook call here
+    (if (eq? run-count 0)
+     (begin  
+      (debug:print-info 0 *default-log-port* "Calling Post Hook")  
+      (debug:print-info 4 *default-log-port* " run-count " run-count)
+      (runs:run-post-hook run-id))
+      (debug:print-info 4 *default-log-port* "Not calling post hook runcount = " run-count ))   
     (rmt:tasks-set-state-given-param-key task-key "done")
     ;; (sqlite3:finalize! tasks-db)
     ))
 
 
@@ -1417,11 +1420,11 @@
 			   newtal:      newtal
 			   itemmaps:    itemmaps
 			   ;; prereqs-not-met: prereqs-not-met
 			   )))
 	(runs:dat-regfull-set! runsdat regfull)
-
+    
         ;; -- removed BB 17ww28 - no longer needed.
 	;; every 15 minutes verify the server is there for this run
 	;; (if (and (common:low-noise-print 240 "try start server"  run-id)
 	;; 	 (not (or (and *runremote*
 	;; 		       (remote-server-url *runremote*)
@@ -1640,11 +1643,13 @@
 	    (thread-sleep! 5)
 	    ;; (wait-loop (rmt:get-count-tests-running-for-run-id run-id) num-running))))
 	    (wait-loop (rmt:get-count-tests-running-for-run-id run-id) num-running))))
     ;; LET* ((test-record
     ;; we get here on "drop through". All done!
-    (runs:run-post-hook run-id)
+    ;; this is moved to runs:run-testes since this function is getting called twice to ensure everthing is completed. 
+    ;; (debug:print-info 0 *default-log-port* "Calling Post Hook")    
+    ;; (runs:run-post-hook run-id)
     (debug:print-info 1 *default-log-port* "All tests launched")))
 
 (define (runs:calc-fails prereqs-not-met)
   (filter (lambda (test)
 	    (and (vector? test) ;; not (string? test))