Megatest

Check-in [8768044873]
Login
Overview
Comment:Added waiton section support in megatest.config
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.64-dyn-waiton
Files: files | file ages | folders
SHA1: 87680448733e512e14a2472f82f876a5a5bc2fb1
User & Date: matt on 2017-04-18 23:42:16
Other Links: branch diff | manifest | tags
Context
2017-04-19
10:07
Remaining changes to make dyn-waiton work well. check-in: a55a132e40 user: mrwellan tags: v1.64-dyn-waiton
2017-04-18
23:42
Added waiton section support in megatest.config check-in: 8768044873 user: matt tags: v1.64-dyn-waiton
22:10
Fixed (I think) dashboard issue with filtering. Bumped version to v1.6407 check-in: 8b97104af8 user: matt tags: v1.64
Changes

Modified tests.scm from [30002a4340] to [83b6a53019].

144
145
146
147
148
149
150
151







152
153
154
155
156
157
158
144
145
146
147
148
149
150

151
152
153
154
155
156
157
158
159
160
161
162
163
164







-
+
+
+
+
+
+
+







      (items:get-items-from-config tconfig))
     (else #f))))                           ;; not iterated


;; returns waitons waitors tconfigdat
;;
(define (tests:get-waitons test-name all-tests-registry)
   (let* ((config  (tests:get-testconfig test-name #f all-tests-registry 'return-procs)))
  (let* ((config  (tests:get-testconfig test-name #f all-tests-registry 'return-procs))
	 (extras  (configf:get-section *configdat* "waitons"))
	 (ewaits  (if extras (alist-ref test-name extras string=?) #f))
	 (ewaitlst (if (and ewaits (not (null? ewaits)))
		       (string-split (car ewaits))
		       '()))
	 )
     (let ((instr (if config 
		      (config-lookup config "requirements" "waiton")
		      (begin ;; No config means this is a non-existant test
			(debug:print-error 0 *default-log-port* "non-existent required test \"" test-name "\"")
			(exit 1))))
	   (instr2 (if config
		       (config-lookup config "requirements" "waitor")
182
183
184
185
186
187
188
189

190
191
192
193
194
195
196
188
189
190
191
192
193
194

195
196
197
198
199
200
201
202







-
+







	  ;; the waitons
	  (filter (lambda (x)
		    (if (hash-table-ref/default all-tests-registry x #f)
			#t
			(begin
			  (debug:print-error 0 *default-log-port* "test " test-name " has unrecognised waiton testname " x)
			  #f)))
		  newwaitons)
		  (append newwaitons ewaitlst))
	  (filter (lambda (x)
		    (if (hash-table-ref/default all-tests-registry x #f)
			#t
			(begin
			  (debug:print-error 0 *default-log-port* "test " test-name " has unrecognised waiton testname " x)
			  #f)))
		  newwaitors)