Overview
Comment: | Added version info to filename in cached configs |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | broken-rmt-top-test-set-per-pf-counts |
Files: | files | file ages | folders |
SHA1: |
bedd2ef21cf8c993f383eedd3dbeef98 |
User & Date: | mrwellan on 2015-07-14 11:44:04 |
Other Links: | branch diff | manifest | tags |
Context
2015-07-14
| ||
12:06 | Merged fix for rollup - 80% there check-in: 656dcda058 user: mrwellan tags: v1.60 | |
11:44 | Added version info to filename in cached configs Closed-Leaf check-in: bedd2ef21c user: mrwellan tags: broken-rmt-top-test-set-per-pf-counts | |
01:01 | renamed few poorly named vars check-in: 55c797a5d2 user: matt tags: broken-rmt-top-test-set-per-pf-counts | |
Changes
Modified docs/manual/server.png from [524d8b2847] to [ae7d7ee58e].
cannot compute difference between binary files
Modified launch.scm from [df725b0bec] to [938e22affa].
︙ | ︙ | |||
493 494 495 496 497 498 499 | ;; special case (if (or force (not (hash-table? *configdat*))) ;; no need to re-open on every call (begin (set! *configinfo* (or (if (get-environment-variable "MT_CMDINFO") ;; we are inside a test - do not reprocess configs (let ((alistconfig (conc (get-environment-variable "MT_LINKTREE") "/" (get-environment-variable "MT_TARGET") "/" (get-environment-variable "MT_RUNNAME") "/" | | | 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 | ;; special case (if (or force (not (hash-table? *configdat*))) ;; no need to re-open on every call (begin (set! *configinfo* (or (if (get-environment-variable "MT_CMDINFO") ;; we are inside a test - do not reprocess configs (let ((alistconfig (conc (get-environment-variable "MT_LINKTREE") "/" (get-environment-variable "MT_TARGET") "/" (get-environment-variable "MT_RUNNAME") "/" ".megatest.cfg-" megatest-version "-" megatest-fossil-hash))) (if (file-exists? alistconfig) (list (configf:read-alist alistconfig) (get-environment-variable "MT_RUN_AREA_HOME")) #f)) #f) ;; no config cached - give up (let ((runname (or (args:get-arg "-runname")(args:get-arg ":runname")))) (if runname (setenv "MT_RUNNAME" runname)) |
︙ | ︙ | |||
572 573 574 575 576 577 578 | (begin (if (not (file-exists? fulldir)) (create-directory fulldir #t)) ;; need to protect with exception handler (if (and target runname (file-exists? fulldir)) (let ((tmpfile (conc fulldir "/.megatest.cfg." (current-seconds))) | | | 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 | (begin (if (not (file-exists? fulldir)) (create-directory fulldir #t)) ;; need to protect with exception handler (if (and target runname (file-exists? fulldir)) (let ((tmpfile (conc fulldir "/.megatest.cfg." (current-seconds))) (targfile (conc fulldir "/.megatest.cfg-" megatest-version "-" megatest-fossil-hash))) (debug:print-info 0 "Caching megatest.config in " fulldir "/.megatest.cfg") (configf:write-alist *configdat* tmpfile) (system (conc "ln -sf " tmpfile " " targfile)) ))))))) (define (get-best-disk confdat) (let* ((disks (hash-table-ref/default confdat "disks" #f)) |
︙ | ︙ |
Modified tests/fullrun/megatest.config from [2435a08c7b] to [0f1324226a].
︙ | ︙ | |||
230 231 232 233 234 235 236 | # <testsuite>/<creationdate> # Within the archive the data is structured like this: # <target>/<runname>/<test>/ disk0 /tmp/#{getenv USER}/adisk1 # Uncomment these to emulate a job queue with a long time (look in bin/sleeprunner for the time) [jobtools] | | | | | > | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 | # <testsuite>/<creationdate> # Within the archive the data is structured like this: # <target>/<runname>/<test>/ disk0 /tmp/#{getenv USER}/adisk1 # Uncomment these to emulate a job queue with a long time (look in bin/sleeprunner for the time) [jobtools] launcher #{scheme (case (string->symbol (conc (getenv "datapath"))) \ ((none) "nbfake") \ ((openlava) "bsub") \ ((sleeprunner) "sleeprunner") (else "nbfake"))} # launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log # launcher #{shell if which bsub > /dev/null;then echo bsub -q priority -o openlava.log;else echo sleeprunner;fi} launcher nbfake [configf:settings trim-trailing-spaces yes] |
︙ | ︙ | |||
283 284 285 286 287 288 289 | # flexi-launcher yes [jobtools] flexi-launcher yes [host-types] general nbfake | | | | 284 285 286 287 288 289 290 291 292 293 294 295 296 | # flexi-launcher yes [jobtools] flexi-launcher yes [host-types] general nbfake remote #{get jobtools launcher} # remote nbfake [launchers] runfirst/sum% remote % general |