Overview
Comment: | Force regen of .testconfig when launching |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.60 |
Files: | files | file ages | folders |
SHA1: |
3f98dd071c41293feed05aeabd3fb815 |
User & Date: | mrwellan on 2015-10-13 09:20:08 |
Other Links: | branch diff | manifest | tags |
Context
2015-10-13
| ||
09:53 | Added notes on where not to rely on testconfig cache check-in: 0e441c579d user: mrwellan tags: v1.60 | |
09:20 | Force regen of .testconfig when launching check-in: 3f98dd071c user: mrwellan tags: v1.60 | |
2015-10-12
| ||
14:43 | Oops, left in a bit of broken debugging code. check-in: a556b1654d user: mrwellan tags: v1.60 | |
Changes
Modified launch.scm from [ce6bfd9d0c] to [b27276ab27].
︙ | ︙ | |||
402 403 404 405 406 407 408 | (thread-sleep! 2) (loop (+ i 1))) ))))) ;; then, if runscript ran ok (or did not get called) ;; do all the ezsteps (if any) (if ezsteps (let* ((testconfig ;; (read-config (conc work-area "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) ;; FIXME??? is allow-system ok here? | | | 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 | (thread-sleep! 2) (loop (+ i 1))) ))))) ;; then, if runscript ran ok (or did not get called) ;; do all the ezsteps (if any) (if ezsteps (let* ((testconfig ;; (read-config (conc work-area "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) ;; FIXME??? is allow-system ok here? (tests:get-testconfig test-name tconfigreg #t force-create: #t)) ;; 'return-procs))) (ezstepslst (hash-table-ref/default testconfig "ezsteps" '()))) (hash-table-set! *testconfigs* test-name testconfig) ;; cached for lazy reads later ... (if (not (file-exists? ".ezsteps"))(create-directory ".ezsteps")) ;; if ezsteps was defined then we are sure to have at least one step but check anyway (if (not (> (length ezstepslst) 0)) (debug:print 0 "ERROR: ezsteps defined but ezstepslst is zero length") (let loop ((ezstep (car ezstepslst)) |
︙ | ︙ | |||
854 855 856 857 858 859 860 | (list "MT_RUNNAME" runname) ;; (list "MT_TARGET" mt_target) )) (let* ((tregistry (tests:get-all)) (item-path (let ((ip (item-list->path itemdat))) (alist->env-vars (list (list "MT_ITEMPATH" ip))) ip)) | | | 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 | (list "MT_RUNNAME" runname) ;; (list "MT_TARGET" mt_target) )) (let* ((tregistry (tests:get-all)) (item-path (let ((ip (item-list->path itemdat))) (alist->env-vars (list (list "MT_ITEMPATH" ip))) ip)) (tconfig (or (tests:get-testconfig test-name tregistry #t force-create: #t) test-conf)) ;; force re-read now that all vars are set (useshell (let ((ush (config-lookup *configdat* "jobtools" "useshell"))) (if ush (if (equal? ush "no") ;; must use "no" to NOT use shell #f ush) #t))) ;; default is yes |
︙ | ︙ |
Modified tests.scm from [fd964d81a0] to [b31debde51].
︙ | ︙ | |||
726 727 728 729 730 731 732 | (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME") "/" (getenv "MT_TEST_NAME") "/" (if (or (getenv "MT_ITEMPATH") (not (string=? "" (getenv "MT_ITEMPATH")))) (conc "/" (getenv "MT_ITEMPATH")))))) | | | > > | 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 | (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME") "/" (getenv "MT_TEST_NAME") "/" (if (or (getenv "MT_ITEMPATH") (not (string=? "" (getenv "MT_ITEMPATH")))) (conc "/" (getenv "MT_ITEMPATH")))))) (define (tests:get-testconfig test-name test-registry system-allowed #!key (force-create #f)) (let* ((test-path (hash-table-ref/default test-registry test-name (conc *toppath* "/tests/" test-name))) (test-configf (conc test-path "/testconfig")) (testexists (and (file-exists? test-configf)(file-read-access? test-configf))) (cache-path (tests:get-test-path-from-environment)) (cache-exists (and cache-path (not force-create) ;; if force-create then pretend there is no cache to read (file-exists? (conc cache-path "/.testconfig")))) (cache-file (conc cache-path "/.testconfig")) (tcfg (if testexists (or (and cache-exists (handle-exceptions exn (begin (debug:print 0 "WARNING: Failed to read " cache-file) |
︙ | ︙ |