Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -399,11 +399,12 @@
 (define (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmap)
   (let* ((loop-list       (list hed tal reg reruns))
 	 (prereqs-not-met (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
 	 (fails           (runs:calc-fails prereqs-not-met))
 	 (prereq-fails    (runs:calc-prereq-fail prereqs-not-met))
-	 (non-completed   (runs:calc-not-completed prereqs-not-met)))
+	 (non-completed   (runs:calc-not-completed prereqs-not-met))
+	 (runnables       (runs:calc-runnable prereqs-not-met)))
     (debug:print-info 4 "START OF INNER COND #2 "
 		      "\n can-run-more:    " can-run-more
 		      "\n testname:        " hed
 		      "\n prereqs-not-met: " (runs:pretty-string prereqs-not-met)
 		      "\n non-completed:   " (runs:pretty-string non-completed) 
@@ -503,64 +504,10 @@
 			(runs:queue-next-tal trimmed-tal trimmed-reg reglen regfull)
 			(runs:queue-next-reg trimmed-tal trimmed-reg reglen regfull)
 			reruns)))
 	      (list (car newtal)(append (cdr newtal) reg) '() reruns))))
 
-     ;; (debug:print-info 1 "allinqueue: " allinqueue)
-     ;; (debug:print-info 1 "prereqstrs: " prereqstrs)
-     ;; (debug:print-info 1 "notinqueue: " notinqueue)
-     ;; (debug:print-info 1 "tal:        " tal)
-     ;; (debug:print-info 1 "newtal:     " newtal)
-     ;; (debug:print-info 1 "reg:        " reg)
-
-;; == ==       ;; num-retries code was here
-;; == ==       ;; we use this opportunity to move contents of reg to tal
-;; == ==       ;; but also lets check that the prerequisites are all in the newtal or reruns lists
-;; == == 
-;; == ==       (let* ((allinqueue (map (lambda (x)(if (string? x) x (db:test-get-testname x)))
-;; == ==         		      (append newtal reruns)))
-;; == == 	     ;; prereqstrs is a list of test names as strings that are prereqs for hed
-;; == ==              (prereqstrs (map (lambda (x)(if (string? x) x (db:test-get-testname x)))
-;; == ==         		      prereqs-not-met))
-;; == == 	     ;; a prereq that is not found in allinqueue will be put in the notinqueue list
-;; == == 	     ;; 
-;; == ==              (notinqueue (filter (lambda (x)
-;; == ==         			   (not (member x allinqueue)))
-;; == ==         			 prereqstrs)))
-;; == ==         (if (not (null? notinqueue))
-;; == ==             (if (runs:can-keep-running? hed 5) ;; try five times
-;; == ==         	(begin
-;; == == 		  (debug:print-info 4 "increment cant-run-tests for " hed)
-;; == ==         	  (runs:inc-cant-run-tests hed)
-;; == ==         	  (list (car newtal)(append (cdr newtal) reg) '() reruns))
-;; == ==         	(begin
-;; == == 		  
-;; == == 		  (if (runs:lownoise (conc "no fails prereq, null notinqueue " hed) 30)
-;; == == 		      (begin
-;; == == 			(debug:print 1 "WARNING: test " hed " has no failed prerequisites but does have prerequistes that are NOT in the queue: " (string-intersperse notinqueue ", "))
-;; == == 			(debug:print-info 4 "allinqueue: " allinqueue)
-;; == == 			(debug:print-info 4 "prereqstrs: " prereqstrs)
-;; == == 			(debug:print-info 4 "notinqueue: " notinqueue)))
-;; == == 		  (if (and (null? tal)(null? reg))
-;; == == 		      (list (car newtal)(append (cdr newtal) reg) '() reruns)
-;; == == 		      (list (runs:queue-next-hed tal reg reglen regfull)
-;; == == 			    (runs:queue-next-tal tal reg reglen regfull)
-;; == == 			    (runs:queue-next-reg tal reg reglen regfull)
-;; == == 			    reruns))))
-;; == == 	    ;; have prereqs in queue, keep going.
-;; == == 	    (begin
-;; == == 	      (if (runs:lownoise (conc "no fails prereq " hed) 30)
-;; == == 		  (debug:print-info 1 "no fails in prerequisites for " hed ", waiting on tests; "
-;; == == 				    (string-intersperse (map (lambda (x)
-;; == == 							       (if (string? x)
-;; == == 								   x
-;; == == 								   (runs:make-full-test-name (db:test-get-testname x)
-;; == == 											     (db:test-get-item-path x))))
-;; == == 							     non-completed) ", ")
-;; == == 				    ". Delaying launch of " hed "."))
-;; == == 	      (list (car newtal)(append (cdr newtal) reg) '() reruns))))) ;; an issue with prereqs not yet met?
-
      ((and (null? fails)
 	   (null? prereq-fails)
 	   (null? non-completed))
       (if  (runs:can-keep-running? hed 5)
 	  (begin
@@ -600,10 +547,11 @@
 
      ((and (not (null? fails))(member 'toplevel testmode))
       (if (or (not (null? reg))(not (null? tal)))
 	   (list (car newtal)(append (cdr newtal) reg) '() reruns)
 	  #f)) 
+     ((null? runnables) #f) ;; if we get here and non-completed is null the it's all over.
      (else
       (debug:print 0 "WARNING: FAILS or incomplete tests maybe preventing completion of this run. Watch for issues with test " hed ", continuing for now")
       ;; (list (runs:queue-next-hed tal reg reglen regfull)
       ;;   	(runs:queue-next-tal tal reg reglen regfull)
       ;;   	(runs:queue-next-reg tal reg reglen regfull)
@@ -1119,10 +1067,26 @@
   (filter
    (lambda (t)
      (or (not (vector? t))
 	 (not (equal? "COMPLETED" (db:test-get-state t)))))
    prereqs-not-met))
+
+(define (runs:calc-not-completed prereqs-not-met)
+  (filter
+   (lambda (t)
+     (or (not (vector? t))
+	 (not (equal? "COMPLETED" (db:test-get-state t)))))
+   prereqs-not-met))
+
+(define (runs:calc-runnable prereqs-not-met)
+  (filter 
+   (lambda (t)
+     (or (not (vector? t))
+	 (and (equal? "NOT_STARTED" (db:test-get-state t))
+	      (member (db:test-get-status t)
+			      '("n/a" "KEEP_TRYING")))))
+   prereqs-not-met))
 
 (define (runs:pretty-string lst)
   (map (lambda (t)
 	 (if (not (vector? t))
 	     (conc t)