Overview
| Comment: | Cherrypick 04685 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | rebase-envprocessing |
| Files: | files | file ages | folders |
| SHA1: |
ab18044a3fd5b92c8f7404cd1ed1f21b |
| User & Date: | mrwellan on 2016-04-27 10:21:55 |
| Other Links: | branch diff | manifest | tags |
Context
|
2016-04-27
| ||
| 10:24 | Cherrypick 8269afbaa4e1a check-in: eaac938df2 user: mrwellan tags: rebase-envprocessing | |
| 10:21 | Cherrypick 04685 check-in: ab18044a3f user: mrwellan tags: rebase-envprocessing | |
| 10:19 | Cherrypick b0c55 check-in: d3cc453649 user: mrwellan tags: rebase-envprocessing | |
Changes
Modified common.scm from [2f72d9979d] to [0341960d9f].
| ︙ | ︙ | |||
469 470 471 472 473 474 475 | (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 | > | | | | 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))))
#f)))
(if valid
(if split
tlist
target)
(if target
(begin
|
| ︙ | ︙ |
Modified launch.scm from [1afa1a3e9e] to [0f69f7678b].
| ︙ | ︙ | |||
720 721 722 723 724 725 726 | (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)))) | | | 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 |
(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)
(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))
|
| ︙ | ︙ |