Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1838,10 +1838,11 @@
   (seconds->time-string (db:step-get-event_time vec)))
 
 ;; db-get-test-steps-for-run
 (define (db:get-steps-for-test dbstruct run-id test-id)
   (let ((res '()))
+
     (sqlite3:for-each-row 
      (lambda (id test-id stepname state status event-time logfile)
        (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "")) res)))
      (db:get-db dbstruct run-id)
      "SELECT id,test_id,stepname,state,status,event_time,logfile_id FROM test_steps WHERE test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,7 @@
 ;; Always use two digit decimal
 ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.5512)
+(define megatest-version 1.5513)
 

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -85,10 +85,30 @@
 (define (mt:get-prereqs-not-met run-id waitons ref-item-path #!key (mode 'normal))
   (db:get-prereqs-not-met run-id waitons ref-item-path mode: mode))
 
 (define (mt:get-run-stats)
   (cdb:remote-run db:get-run-stats #f))
+
+(define (mt:discard-blocked-tests run-id failed-test tests test-records)
+  (if (null? tests)
+      tests
+      (begin
+	(debug:print-info 1 "Discarding tests from " tests " that are waiting on " failed-test)
+	(let loop ((testn (car tests))
+		   (remt  (cdr tests))
+		   (res   '()))
+	  (let ((waitons (vector-ref (hash-table-ref/default test-records testn (vector #f #f '())) 2)))
+	    ;; (print "mt:discard-blocked-tests run-id: " run-id " failed-test: " failed-test " testn: " testn " with waitons: " waitons)
+	    (if (null? remt)
+		(let ((new-res (reverse res)))
+		  ;; (print "       new-res: " new-res)
+		  new-res)
+		(loop (car remt)
+		      (cdr remt)
+		      (if (member failed-test waitons)
+			  res
+			  (cons testn res)))))))))
 
 ;;======================================================================
 ;;  T R I G G E R S
 ;;======================================================================
 

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -367,11 +367,11 @@
 	  '()
 	  reg)))
 
 (define runs:nothing-left-in-queue-count 0)
 
-(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)
+(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)
   (let* ((loop-list       (list hed tal reg reruns))
 	 (prereqs-not-met (mt:get-prereqs-not-met run-id waitons item-path mode: testmode))
 	 (fails           (runs:calc-fails prereqs-not-met))
 	 (non-completed   (runs:calc-not-completed prereqs-not-met)))
     (debug:print-info 4 "START OF INNER COND #2 "
@@ -450,18 +450,21 @@
 		    (if (eq? (hash-table-ref/default test-registry prereq 'justfine) 'CANNOTRUN)
 			(set! give-up #t)))
 		  prereqstrs)
 	(if (and give-up
 		 (not (and (null? tal)(null? reg))))
-	    (begin
-	      (debug:print 1 "WARNING: test " hed " has no discarded prerequisites, removing it from the queue")
-	      (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))
-	    (list (car newtal)(append (cdr newtal) reg) '() reruns))))
-
+	    (let ((trimmed-tal (mt:discard-blocked-tests run-id hed tal test-records))
+		  (trimmed-reg (mt:discard-blocked-tests run-id hed reg test-records)))
+	      (debug:print 1 "WARNING: test " hed " has discarded prerequisites, removing it from the queue")
+	      (if (and (null? trimmed-tal)
+		       (null? trimmed-reg))
+		  #f
+		  (list (runs:queue-next-hed trimmed-tal trimmed-reg reglen regfull)
+			(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)
@@ -874,11 +877,11 @@
 	 ;; EXPAND ITEMS
 	 ((or (procedure? items)(eq? items 'have-procedure))
 	  (let ((can-run-more    (runs:can-run-more-tests jobgroup max-concurrent-jobs)))
 	    (if (and (list? can-run-more)
 		     (car can-run-more))
-		(let ((loop-list (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)))
+		(let ((loop-list (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)))
 		  (if loop-list
 		      (apply loop loop-list)))
 		;; if can't run more just loop with next possible test
 		(loop (car newtal)(cdr newtal) reg reruns))))
 	    

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -1,5 +1,6 @@
+#
 # run some tests
 
 BINPATH=$(shell readlink -m $(PWD)/../bin)
 MEGATEST=$(BINPATH)/megatest
 PATH := $(BINPATH):$(PATH)
@@ -99,11 +100,11 @@
 	cd fullrun;$(MEGATEST) -runtests runfirst/fall 1 -target ubuntu/nfs/none :runname $(RUNNAME)_singleitem
 	cd fullrun;$(MEGATEST) -runtests test_mt_vars/2 -target ubuntu/nfs/none :runname $(RUNNAME)_singleitem_waiton
 
 # Some simple checks for bootstrapping and run loop logic 
 
-test9 : minsetup test9a test9b test9c test9d
+test9 : minsetup test9a test9b test9c test9d test9e
 
 test9a :
 	@echo Run super-simple mintest e, no waitons.
 	cd mintest;megatest -runtests e -target $(VER) :runname `date +%H.%M.%S` -debug $(DEBUG)
 
@@ -117,10 +118,14 @@
 
 test9d :
 	@echo Run an itemized test with no items
 	cd mintest;megatest -runtests g -target $(VER) :runname `date +%H.%M.%S` -debug $(DEBUG)
 
+test9e :
+	@echo Run mintest a1 with full waiton chain with d1fail: a1 -> b1 -> c1 -> d1fail -> e1
+	cd mintest;megatest -runtests a1 -target $(VER) :runname `date +%H.%M.%S` -debug $(DEBUG)
+
 test10 :
 	@echo Run a bunch of different targets simultaneously
 	(cd fullrun;$(MEGATEST) -server - ;sleep 2)&
 	for targ in mint/btrfs/mintdir sunos/sshfs/loc; do \
 	   (cd fullrun;$(MEGATEST) -runtests priority_10_waiton_1 -target $$targ :runname $(RUNNAME) &); done

ADDED   tests/mintest/tests/a1/testconfig
Index: tests/mintest/tests/a1/testconfig
==================================================================
--- /dev/null
+++ tests/mintest/tests/a1/testconfig
@@ -0,0 +1,6 @@
+# Add steps here. Format is "stepname script"
+[ezsteps]
+step1 echo SUCCESS
+
+[requirements]
+waiton b1

ADDED   tests/mintest/tests/b1/testconfig
Index: tests/mintest/tests/b1/testconfig
==================================================================
--- /dev/null
+++ tests/mintest/tests/b1/testconfig
@@ -0,0 +1,6 @@
+# Add steps here. Format is "stepname script"
+[ezsteps]
+step1 echo SUCCESS
+
+[requirements]
+waiton c1

ADDED   tests/mintest/tests/c1/testconfig
Index: tests/mintest/tests/c1/testconfig
==================================================================
--- /dev/null
+++ tests/mintest/tests/c1/testconfig
@@ -0,0 +1,6 @@
+# Add steps here. Format is "stepname script"
+[ezsteps]
+step1 echo SUCCESS
+
+[requirements]
+waiton d1fail

ADDED   tests/mintest/tests/d1fail/testconfig
Index: tests/mintest/tests/d1fail/testconfig
==================================================================
--- /dev/null
+++ tests/mintest/tests/d1fail/testconfig
@@ -0,0 +1,7 @@
+# Add steps here. Format is "stepname script"
+[ezsteps]
+step1 echo SUCCESS
+step2 exit 123
+
+[requirements]
+waiton e1

ADDED   tests/mintest/tests/e1/testconfig
Index: tests/mintest/tests/e1/testconfig
==================================================================
--- /dev/null
+++ tests/mintest/tests/e1/testconfig
@@ -0,0 +1,4 @@
+# Add steps here. Format is "stepname script"
+[ezsteps]
+step1 echo SUCCESS
+