Megatest

Check-in [0bfc8baff4]
Login
Overview
Comment:tweak ordering of config processing again
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | envprocessing
Files: files | file ages | folders
SHA1: 0bfc8baff4e7cf69ebf8e665eca5d5599e6a0aea
User & Date: mrwellan on 2016-03-04 14:11:47
Other Links: branch diff | manifest | tags
Context
2016-03-06
20:52
Merged envprocessing into v1.60 check-in: a1d77f1a3b user: matt tags: v1.60_defunct
2016-03-04
14:11
tweak ordering of config processing again Closed-Leaf check-in: 0bfc8baff4 user: mrwellan tags: envprocessing
09:22
Fixed runconfigs handling check-in: 297275b93f user: mrwellan tags: envprocessing
Changes

Modified launch.scm from [a14c9a2485] to [e9781be215].

610
611
612
613
614
615
616

617
618
619
620
621
622
623
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624







+







;;           *configstatus* (status of the read data)
;;
(define (launch:setup #!key (force #f))
  (let* ((toppath  (or *toppath* (getenv "MT_RUN_AREA_HOME"))) ;; preserve toppath
	 (runname  (common:args-get-runname))
	 (target   (common:args-get-target))
	 (linktree (common:get-linktree))
	 (sections (if target (list "default" target) #f)) ;; for runconfigs
	 (mtconfig (or (args:get-arg "-config") "megatest.config")) ;; allow overriding megatest.config 
	 (rundir   (if (and runname target linktree)(conc linktree "/" target "/" runname) #f))
	 (mtcachef (and rundir (conc rundir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
	 (rccachef (and rundir (conc rundir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
	 (cancreate (and rundir (file-exists? rundir)(file-write-access? rundir))))
    ;; (print "runname: " runname " target: " target " mtcachef: " mtcachef " rccachef: " rccachef)
    (set! *toppath* toppath) ;; This is needed when we are running as a test using CMDINFO as a datasource
631
632
633
634
635
636
637
638
639

640
641
642
643
644
645
646
632
633
634
635
636
637
638


639
640
641
642
643
644
645
646







-
-
+







      (set! *runconfigdat* (configf:read-alist rccachef))
      (set! *configinfo*   (list *configdat*  (get-environment-variable "MT_RUN_AREA_HOME")))
      (set! *configstatus* 'fulldata)
      (set! *toppath*      (get-environment-variable "MT_RUN_AREA_HOME"))
      *toppath*)
     ;; we have all the info needed to fully process runconfigs and megatest.config
     (mtcachef              
      (let* ((sections   (list "default" target)) ;; for runconfigs
	     (first-pass (find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
      (let* ((first-pass (find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
				  mtconfig
				  environ-patt: "env-override"
				  given-toppath: toppath
				  pathenvvar: "MT_RUN_AREA_HOME"))
	     (first-rundat  (read-config (conc toppath "/runconfigs.config") *runconfigdat* #t 
					 sections: sections)))
	(set! *runconfigdat* first-rundat)
678
679
680
681
682
683
684
685
686

687
688
689
690
691
692
693
678
679
680
681
682
683
684


685
686
687
688
689
690
691
692







-
-
+







     (else
      (let* ((cfgdat   (find-and-read-config 
			(or (args:get-arg "-config") "megatest.config")
			environ-patt: "env-override"
			given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
			pathenvvar: "MT_RUN_AREA_HOME")))
	(if cfgdat
	    (let* ((sections (if target (list "default" target) #f))
		   (toppath  (or (get-environment-variable "MT_RUN_AREA_HOME")(cadr cfgdat)))
	    (let* ((toppath  (or (get-environment-variable "MT_RUN_AREA_HOME")(cadr cfgdat)))
		   (rdat     (read-config (conc toppath
						"/runconfigs.config") *runconfigdat* #t sections: sections)))
	      (set! *configinfo*   cfgdat)
	      (set! *configdat*    (car cfgdat))
	      (set! *runconfigdat* rdat)
	      (set! *toppath*      toppath)
	      (set! *configstatus* 'partial))