Megatest

Check-in [2b8ac70e49]
Login
Overview
Comment:Merged in itemmap fixes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.60
Files: files | file ages | folders
SHA1: 2b8ac70e499bd91a023d33c4c16d202c2f5d97ca
User & Date: mrwellan on 2015-07-30 00:54:47
Other Links: branch diff | manifest | tags
Context
2015-07-30
15:02
Bumped version check-in: d6f372dca6 user: mrwellan tags: v1.60
00:54
Merged in itemmap fixes check-in: 2b8ac70e49 user: mrwellan tags: v1.60
00:53
Got dep-test itemmaps in the correct testconfigs, fixed ordering of added itempatts Closed-Leaf check-in: 13f20f1286 user: matt tags: v1.60-itempatt-itemmap
2015-07-29
23:57
Merged in item deps handling fix branch: check-in: 7d8e24827c user: mrwellan tags: v1.60
Changes

Modified runs.scm from [cdda747b65] to [b24323548a].

397
398
399
400
401
402
403
404
405


406
407
408
409
410
411
412
397
398
399
400
401
402
403


404
405
406
407
408
409
410
411
412







-
-
+
+







	     (lambda (waiton)
	       (if (and waiton (not (member waiton test-names)))
		   (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?
		     ;;
		     ;; This approach causes all of the items in an upstream test to be run 

Modified tests.scm from [6ce512b6dd] to [e76dcf1b44].

72
73
74
75
76
77
78









79
80
81
82
83
84
85
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94







+
+
+
+
+
+
+
+
+







  (delete-duplicates
   (filter (lambda (testname)
	     (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)) 
				   (newpatt (conc test-a "/," test-a "/" (substring modpatt test-b-len (string-length modpatt)))))
			      ;; (print "in map, x=" x ", newpatt=" newpatt)

Modified tests/dep-tests/tests/genlib/testconfig from [37b8dd3e28] to [5997267de8].

1
2
3
4
5
6
7
8

1
2
3
4
5
6
7

8







-
+
[include #{getenv MT_RUN_AREA_HOME}/common.testconfig]

[itemstable]
VIEWTYPE layout schematic

[requirements]
waiton #{get #{getenv DEPS} genlib}
itemmap /.*
# itemmap /.*

Modified tests/dep-tests/tests/test1/testconfig from [9d441a3bde] to [d6e3a28a40].

1
2
3
4
5
6





1
2
3
4
5
6
7
8
9
10
11






+
+
+
+
+
[include #{getenv MT_RUN_AREA_HOME}/common.testconfig]

[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 /.*