Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -399,12 +399,12 @@ (let* ((waiton-record (hash-table-ref/default test-records waiton #f)) (waiton-tconfig (if waiton-record (vector-ref waiton-record 1) #f)) (waiton-itemized (and waiton-tconfig (or (hash-table-ref/default waiton-tconfig "items" #f) (hash-table-ref/default waiton-tconfig "itemstable" #f)))) - (waiton-itemmap (configf:lookup waiton-tconfig "requirements" "itemmap")) - (new-test-patts (tests:extend-test-patts test-patts hed waiton waiton-itemmap))) + (itemmap (configf:lookup config "requirements" "itemmap")) + (new-test-patts (tests:extend-test-patts test-patts hed waiton itemmap))) (debug:print-info 0 "Test " waiton " has " (if waiton-record "a" "no") " waiton-record and" (if waiton-itemized " " " no ") "items") ;; 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? ;; Index: tests.scm ================================================================== --- tests.scm +++ tests.scm @@ -74,10 +74,19 @@ (tests:match test-patts testname #f)) test-names))) ;; given test-b that is waiting on test-a extend test-patt appropriately ;; +;; genlib/testconfig sim/testconfig +;; genlib/sch sim/sch/cell1 +;; +;; [requirements] [requirements] +;; mode itemwait +;; # trim off the cell to determine what to run for genlib +;; itemmap /.* +;; +;; test-a is waiting on test-b so we need to create a pattern for test-b given test-a and itemmap (define (tests:extend-test-patts test-patt test-b test-a itemmap) (let* ((patts (string-split test-patt ",")) (test-b-len (+ (string-length test-b) 1)) (patts-b (map (lambda (x) (let* ((modpatt (if itemmap (db:convert-test-itempath x itemmap) x)) Index: tests/dep-tests/tests/genlib/testconfig ================================================================== --- tests/dep-tests/tests/genlib/testconfig +++ tests/dep-tests/tests/genlib/testconfig @@ -3,6 +3,6 @@ [itemstable] VIEWTYPE layout schematic [requirements] waiton #{get #{getenv DEPS} genlib} -itemmap /.* +# itemmap /.* Index: tests/dep-tests/tests/test1/testconfig ================================================================== --- tests/dep-tests/tests/test1/testconfig +++ tests/dep-tests/tests/test1/testconfig @@ -2,5 +2,10 @@ [include #{getenv MT_RUN_AREA_HOME}/common_itemstable.testconfig] [requirements] waiton #{get #{getenv DEPS} test1} + +# itemmap maps these items back to previous test +# NB// mapping is in reverse - NOT forwards! +# +itemmap /.*