@@ -909,17 +909,25 @@
            (running-cnt (rmt:get-count-tests-running-for-run-id run-id))
            (all-test-launched (rmt:get-var (conc "lunch-complete-" run-id)))
            (current-state (rmt:get-run-state run-id))
            (current-status (rmt:get-run-status run-id)))
      ;;get-vars run-id to query metadata table to check if all completed. if all-test-launched = yes then only not-completed-cnt = 0 means everyting is completed if no entry found in the table do nothing 
-     (debug:print 0 *default-log-port* "rollup run state/status")                      
+     (debug:print 0 *default-log-port* "Running test cnt :" running-cnt)                      
      (rmt:set-state-status-and-roll-up-run  run-id current-state current-status)
      (runs:update-junit-test-reporter-xml run-id) 
      (cond 
        ((and all-test-launched (eq? not-completed-cnt 0) (equal? all-test-launched "yes" ))
-           	(debug:print 0 *default-log-port* "look for  post hook.")
-          	(runs:run-post-hook run-id))
+                (if (and (equal? (rmt:get-var (conc "end-of-run-" run-id)) "no") (common:simple-lock (conc "endOfRun" run-id)))
+                (begin
+           	(debug:print 4 *default-log-port* "look for  post hook. currseconds: " (current-seconds) " EOR " (rmt:get-var (conc "end-of-run-" run-id)))
+                (debug:print 0 *default-log-port* "End of Run Detected.")
+                (rmt:set-var (conc "end-of-run-" run-id) "yes")
+                ;(thread-sleep! 10)
+          	(runs:run-post-hook run-id)
+                (debug:print 4 *default-log-port* "currseconds: " (current-seconds)" eor: " (rmt:get-var (conc "end-of-run-" run-id)))
+                (common:simple-unlock (conc "endOfRun" run-id)))
+                 (debug:print 0 *default-log-port* "End of Run Detected but not running post hook. This should happen when eor is set to yes. This will happen only when 2 tests exit at smae time. eor= " (rmt:get-var (conc "end-of-run-" run-id)))))
         ((> running-cnt 3) 
         	  (debug:print 0 *default-log-port* "There are " running-cnt " tests running." ))
         ((> running-cnt 0)
             (debug:print 0 *default-log-port* "running cnt > 0 but <= 3 kill-running-tests-if-dead" )
    				  (let ((kill-cnt (launch:kill-tests-if-dead run-id)))
@@ -935,18 +943,18 @@
 			       	(debug:print 0 *default-log-port* "test " test-name "/" item-path " not completed")
               (if (not (null? tal))
 				  (loop (car tal) (cdr tal)))))))))))        
  
 (define (launch:is-test-alive host pid)
-(if (and host pid (not (equal? host "n/a")))
-(let* ((cmd (conc "ssh " host " pstree -A " pid))
-      (output (with-input-from-pipe cmd read-lines)))
-  (print "cmd: " cmd "\n op: " output )
-  (if(eq? (length output) 0)
-     #f
-     #t))
-#t))
+  (if (and host pid (not (equal? host "n/a")))
+      (let* ((cmd (conc "ssh " host " pstree -A " pid))
+	     (output (with-input-from-pipe cmd read-lines)))
+	(debug:print 2 *default-log-port* "Running " cmd " received " output)
+	(if (eq? (length output) 0)
+	   #f
+	   #t))
+      #t))
  
 (define (launch:kill-tests-if-dead run-id)
   (let* ((running-tests (rmt:get-tests-for-run run-id "%" `("RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
        (let loop ((running-test (car running-tests))
 			     (tal    (cdr running-tests))
@@ -1399,29 +1407,29 @@
 	(let ((iterated-parent  (pathname-directory (conc lnkpath "/" item-path))))
 	  (debug:print-info 2 *default-log-port* "Creating iterated parent " iterated-parent)
 	  (handle-exceptions
 	   exn
 	   (begin
-	     (debug:print-error 0 *default-log-port* " Failed to create directory " iterated-parent ((condition-property-accessor 'exn 'message) exn) ", exiting")
-	     (exit 1))
+	     (debug:print-error 0 *default-log-port* " Failed to create directory " iterated-parent ((condition-property-accessor 'exn 'message) exn) ", continuing but link tree may be corrupted")
+	     #;(exit 1))
 	   (create-directory iterated-parent #t))))
 
     (if (symbolic-link? lnkpath) 
 	(handle-exceptions
 	 exn
 	 (begin
-	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", exiting")
-	   (exit 1))
+	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", continuing but link tree may be corrupted.")
+	   #;(exit 1))
 	 (delete-file lnkpath)))
 
     (if (not (or (common:file-exists? lnkpath)
 		 (symbolic-link? lnkpath)))
 	(handle-exceptions
 	 exn
 	 (begin
-	   (debug:print-error 0 *default-log-port* " Failed to create symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", exiting")
-	   (exit 1))
+	   (debug:print-error 0 *default-log-port* " Failed to create symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", continuing but link tree may be corrupted.")
+	   #;(exit 1))
 	 (create-symbolic-link toptest-path lnkpath)))
     
     ;; NB - This was not working right - some top tests are not getting the path set!!!
     ;;
     ;; Do the setting of this record after the paths are created so that the shortdir can