Megatest

Check-in [a034278830]
Login
Overview
Comment:For -reqtarg we need to allow system in runconfigs parsing or we won't see some runs
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA1: a0342788306c716b420ff00d5b514e161c686186
User & Date: mrwellan on 2013-03-11 15:08:50
Other Links: branch diff | manifest | tags
Context
2013-03-11
15:17
Release v1.5302 merged from development check-in: 5e13bdcb3a user: mrwellan tags: trunk
15:08
For -reqtarg we need to allow system in runconfigs parsing or we won't see some runs Leaf check-in: a034278830 user: mrwellan tags: dev
14:36
Fixed bug in -show-config and -show-runconfig and added json output check-in: 58eba43a32 user: mrwellan tags: dev
Changes

Modified megatest.scm from [e6e640b809] to [80fae04dd6].

353
354
355
356
357
358
359
360

361
362
363
364
365
366
367
368
369
370
371
372
373

374
375
376
377
378
379
380
353
354
355
356
357
358
359

360
361
362
363
364
365
366
367
368
369
370
371
372

373
374
375
376
377
378
379
380







-
+












-
+







(if (args:get-arg "-show-runconfig")
    (let* ((target (if (args:get-arg "-reqtarg")
		       (args:get-arg "-reqtarg")
		       (if (args:get-arg "-target")
			   (args:get-arg "-target")
			   #f)))
	   (sections (if target (list "default" target) #f))
	   (data     (read-config "runconfigs.config" #f #f sections: sections)))
	   (data     (read-config "runconfigs.config" #f #t sections: sections)))

      ;; keep this one local
      (cond
       ((not (args:get-arg "-dumpmode"))
	(pp (hash-table->alist data)))
       ((string=? (args:get-arg "-dumpmode") "json")
	(json-write data))
       (else
	(debug:print 0 "ERROR: -dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
      (set! *didsomething* #t)))

(if (args:get-arg "-show-config")
    (let ((data (read-config "megatest.config" #f #f)))
    (let ((data (read-config "megatest.config" #f #t)))
      ;; keep this one local
      (cond 
       ((not (args:get-arg "-dumpmode"))
	(pp (hash-table->alist data)))
       ((string=? (args:get-arg "-dumpmode") "json")
	(json-write data))
       (else

Modified runs.scm from [d3996a36c3] to [8801ee7227].

892
893
894
895
896
897
898
899

900
901
902
903
904
905
906
892
893
894
895
896
897
898

899
900
901
902
903
904
905
906







-
+







 	    ;;     	 (args:get-arg "-runtests")))
	    ;;     (client:setup) ;; This is a duplicate startup!!!??? BUG?
	    ;;     ))
	(set! keys (open-run-close db:get-keys db))
	;; have enough to process -target or -reqtarg here
	(if (args:get-arg "-reqtarg")
	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; DO NOT EVALUATE ALL 
		   (runconfig  (read-config runconfigf #f #f environ-patt: #f))) 
		   (runconfig  (read-config runconfigf #f #t environ-patt: #f))) 
	      (if (hash-table-ref/default runconfig (args:get-arg "-reqtarg") #f)
		  (keys:target-set-args keys (args:get-arg "-reqtarg") args:arg-hash)
		  (begin
		    (debug:print 0 "ERROR: [" (args:get-arg "-reqtarg") "] not found in " runconfigf)
		    (if db (sqlite3:finalize! db))
		    (exit 1))))
	    (if (args:get-arg "-target")