@@ -34,10 +34,12 @@
   (let* ((testname (db:test-get-testname   test))
 	 (itempath (db:test-get-item-path test)))
     (conc testname (if (equal? itempath "") "" (conc "(" itempath ")")))))
 
 ;; This is the *new* methodology. One record to inform them and in the chaos, organise them.
+;;
+;; NOT YET UTILIZED
 ;;
 (define (runs:create-run-record)
   (let* ((mconfig      (if *configdat*
 		           *configdat*
 		           (if (launch:setup-for-run)
@@ -216,11 +218,11 @@
 	 (test-records       (make-hash-table))
 	 ;; need to process runconfigs before generating these lists
 	 (all-tests-registry #f)  ;; (tests:get-all)) ;; (tests:get-valid-tests (make-hash-table) test-search-path)) ;; all valid tests to check waiton names
 	 (all-test-names     #f)  ;; (hash-table-keys all-tests-registry))
 	 (test-names         #f)  ;; (tests:filter-test-names all-test-names test-patts))
-	 (required-tests     #f)  ;;(lset-intersection equal? (string-split test-patts ",") test-names))) ;; test-names)) ;; Added test-names as initial for required-tests but that failed to work
+	 (required-tests     #f)  ;; Put fully qualified test/testpath names in this list to be done
 	 (task-key           (conc (hash-table->alist flags) " " (get-host-name) " " (current-process-id)))
 	 (tdbdat             (tasks:open-db)))
 
     (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 
@@ -259,10 +261,17 @@
     (set! all-tests-registry (tests:get-all))
     (set! all-test-names     (hash-table-keys all-tests-registry))
     (set! test-names         (tests:filter-test-names all-test-names test-patts))
 
     ;; I think seeding required-tests with all test-names makes sense but lack analysis to back that up.
+
+    ;; NEW STRATEGY HERE:
+    ;; 1. fill required tests with test-patts
+    ;; 2. scan testconfigs and if waitons, itemwait, itempatt calc prior test test-patt
+    ;; 3. repeat until all deps propagated
+    
+    ;; any tests with direct mention in test-patts can be added to required
     ;;
     (set! required-tests     (lset-intersection equal? (string-split test-patts ",") all-test-names))
     ;; (set! required-tests     (lset-intersection equal? test-names all-test-names))
     
     ;; look up all tests matching the comma separated list of globs in
@@ -376,20 +385,34 @@
 					     #f      ;; spare - used for item-path
 					     )))
 	    (for-each 
 	     (lambda (waiton)
 	       (if (and waiton (not (member waiton test-names)))
-		   (begin
-		     (set! required-tests (cons waiton required-tests))
+		   (let ((new-test-patts (tests:extend-test-patts test-patts hed waiton #f)))
+		     ;; 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 
+
+		     (debug:print-info 0 "new-test-patts: " new-test-patts ", prev test-patts: " test-patts)
+		     (if (equal? new-test-patts test-patts)
+			 (set! required-tests (cons waiton required-tests)) ;; (cons (conc waiton "/") required-tests))
+			 (set! test-patts new-test-patts))
+		     
+		     ;; 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
 	     waitons)
 	    (let ((remtests (delete-duplicates (append waitons tal))))
 	      (if (not (null? remtests))
 		  (loop (car remtests)(cdr remtests)))))))
 
     (if (not (null? required-tests))
-	(debug:print-info 1 "Adding " required-tests " to the run queue"))
+	(debug:print-info 1 "Adding \"" (string-intersperse required-tests " ") "\" to the run queue"))
     ;; NOTE: these are all parent tests, items are not expanded yet.
     (debug:print-info 4 "test-records=" (hash-table->alist test-records))
     (let ((reglen (configf:lookup *configdat* "setup" "runqueue")))
       (if (> (length (hash-table-keys test-records)) 0)
 	  (let* ((keep-going        #t)
@@ -427,10 +450,11 @@
 		(begin
 		  (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)))))
 	  (debug:print-info 0 "No tests to run")))
     (debug:print-info 4 "All done by here")
     (rmt:tasks-set-state-given-param-key task-key "done")
     ;; (sqlite3:finalize! tasks-db)