Megatest

Check-in [046859c4e5]
Login
Overview
Comment:suppressed bad error regarding keys from before the confi g is parsed. removed print statements
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | envprocessing
Files: files | file ages | folders
SHA1: 046859c4e52b5e53388f6a64d45f2bbb6f2ea945
User & Date: matt on 2016-03-01 23:24:10
Other Links: branch diff | manifest | tags
Context
2016-03-03
17:04
Added better error message when issues happen in configf check-in: 8269afbaa4 user: mrwellan tags: envprocessing
2016-03-01
23:24
suppressed bad error regarding keys from before the confi g is parsed. removed print statements check-in: 046859c4e5 user: matt tags: envprocessing
23:17
clean up some arg handling check-in: b0c55bc31f user: matt tags: envprocessing
Changes

Modified common.scm from [2f72d9979d] to [0341960d9f].

469
470
471
472
473
474
475

476
477
478



479
480
481
482
483
484
485
469
470
471
472
473
474
475
476



477
478
479
480
481
482
483
484
485
486







+
-
-
-
+
+
+







  (let* ((keys    (if *configdat* (keys:config-get-fields *configdat*) '()))
	 (numkeys (length keys))
	 (target  (or (args:get-arg "-reqtarg")
		      (args:get-arg "-target")
		      (getenv "MT_TARGET")))
	 (tlist   (if target (string-split target "/" #t) '()))
	 (valid   (if target
		      (or (null? keys) ;; probably don't know our keys yet
		      (and (not (null? tlist))
			   (eq? numkeys (length tlist))
			   (null? (filter string-null? tlist)))
			  (and (not (null? tlist))
			       (eq? numkeys (length tlist))
			       (null? (filter string-null? tlist))))
		      #f)))
    (if valid
	(if split
	    tlist
	    target)
	(if target
	    (begin

Modified launch.scm from [bf85098351] to [a29cc8fd49].

617
618
619
620
621
622
623
624

625
626
627
628
629
630
631
617
618
619
620
621
622
623

624
625
626
627
628
629
630
631







-
+







  (let* ((runname  (common:args-get-runname))
	 (target   (common:args-get-target))
	 (linktree (common:get-linktree))
	 (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)
    ;; (print "runname: " runname " target: " target " mtcachef: " mtcachef " rccachef: " rccachef)
    (cond
     ;; data was read and cached and available in *configstatus*
     ((eq? *configstatus* 'fulldata)
      *toppath*)
     ;; if mtcachef exists just read it
     ((and mtcachef (file-exists? mtcachef))
      (set! *configdat*    (configf:read-alist mtcachef))