Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -394,16 +394,17 @@ #f ;; spare - used for item-path ))) (for-each (lambda (waiton) (if (and waiton (not (member waiton test-names))) - (let* ((new-test-patts (tests:extend-test-patts test-patts hed waiton #f)) - (waiton-record (hash-table-ref/default test-records waiton #f)) + (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))))) + (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))) (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/dep-tests/tests/test1/testconfig ================================================================== --- tests/dep-tests/tests/test1/testconfig +++ tests/dep-tests/tests/test1/testconfig @@ -2,6 +2,5 @@ [include #{getenv MT_RUN_AREA_HOME}/common_itemstable.testconfig] [requirements] waiton #{get #{getenv DEPS} test1} -itemmap /.*