Overview
| SHA1 Hash: | 6e011c5c19425dced8eca906ca765e2d67f1c980 |
|---|---|
| Date: | 2012-06-15 14:08:43 |
| User: | mrwellan |
| Comment: | Probable fix for remote tests via symlinks issue |
| Timelines: | family | ancestors | descendants | both | v1.44 |
| Diffs: | root of this branch |
| Downloads: | Tarball | ZIP archive |
| Other Links: | files | file ages | manifest |
Tags And Properties
- branch=v1.44 inherited from [f071891318]
- sym-v1.44 inherited from [f071891318]
- sym-v1.4401 cancelled by [aed566e3aa] on 2012-06-15 16:38:46
Changes
Modified launch.scm from [58b19d2e86296251] to [5c9948d4db56513b].
45 45 46 (define (launch:execute encoded-cmd) 46 (define (launch:execute encoded-cmd) 47 (let* ((cmdinfo (read (open-input-string (base64:base64-decode encoded-cmd)) 47 (let* ((cmdinfo (read (open-input-string (base64:base64-decode encoded-cmd)) 48 (setenv "MT_CMDINFO" encoded-cmd) 48 (setenv "MT_CMDINFO" encoded-cmd) 49 (if (list? cmdinfo) ;; ((testpath /tmp/mrwellan/jazzmind/src/example_run/tes 49 (if (list? cmdinfo) ;; ((testpath /tmp/mrwellan/jazzmind/src/example_run/tes 50 ;; (test-name sqlitespeed) (runscript runscript.rb) (db- 50 ;; (test-name sqlitespeed) (runscript runscript.rb) (db- 51 (let* ((testpath (assoc/default 'testpath cmdinfo)) 51 (let* ((testpath (assoc/default 'testpath cmdinfo)) > 52 (top-path (assoc/default 'toppath cmdinfo)) 52 (work-area (assoc/default 'work-area cmdinfo)) 53 (work-area (assoc/default 'work-area cmdinfo)) 53 (test-name (assoc/default 'test-name cmdinfo)) 54 (test-name (assoc/default 'test-name cmdinfo)) 54 (runscript (assoc/default 'runscript cmdinfo)) 55 (runscript (assoc/default 'runscript cmdinfo)) 55 (ezsteps (assoc/default 'ezsteps cmdinfo)) 56 (ezsteps (assoc/default 'ezsteps cmdinfo)) 56 (db-host (assoc/default 'db-host cmdinfo)) 57 (db-host (assoc/default 'db-host cmdinfo)) 57 (run-id (assoc/default 'run-id cmdinfo)) 58 (run-id (assoc/default 'run-id cmdinfo)) 58 (test-id (assoc/default 'test-id cmdinfo)) 59 (test-id (assoc/default 'test-id cmdinfo)) ................................................................................................................................................................................ 64 (megatest (assoc/default 'megatest cmdinfo)) 65 (megatest (assoc/default 'megatest cmdinfo)) 65 (mt-bindir-path (assoc/default 'mt-bindir-path cmdinfo)) 66 (mt-bindir-path (assoc/default 'mt-bindir-path cmdinfo)) 66 (fullrunscript (if runscript (conc testpath "/" runscript) #f)) 67 (fullrunscript (if runscript (conc testpath "/" runscript) #f)) 67 (db #f) 68 (db #f) 68 (rollup-status 0)) 69 (rollup-status 0)) 69 70 70 (debug:print 2 "Exectuing " test-name " (id: " test-id ") on " (get-ho 71 (debug:print 2 "Exectuing " test-name " (id: " test-id ") on " (get-ho 71 (change-directory testpath) < 72 ;; apply pre-overrides before other variables. The pre-override vars m 72 ;; apply pre-overrides before other variables. The pre-override vars m 73 ;; clobbers things from the official sources such as megatest.config a 73 ;; clobbers things from the official sources such as megatest.config a 74 (if (string? set-vars) 74 (if (string? set-vars) 75 (let ((varpairs (string-split set-vars ","))) 75 (let ((varpairs (string-split set-vars ","))) 76 (debug:print 4 "varpairs: " varpairs) 76 (debug:print 4 "varpairs: " varpairs) 77 (map (lambda (varpair) 77 (map (lambda (varpair) 78 (let ((varval (string-split varpair "="))) 78 (let ((varval (string-split varpair "="))) ................................................................................................................................................................................ 85 (setenv "MT_TEST_RUN_DIR" work-area) 85 (setenv "MT_TEST_RUN_DIR" work-area) 86 (setenv "MT_TEST_NAME" test-name) 86 (setenv "MT_TEST_NAME" test-name) 87 (setenv "MT_ITEM_INFO" (conc itemdat)) 87 (setenv "MT_ITEM_INFO" (conc itemdat)) 88 (setenv "MT_RUNNAME" runname) 88 (setenv "MT_RUNNAME" runname) 89 (setenv "MT_MEGATEST" megatest) 89 (setenv "MT_MEGATEST" megatest) 90 (setenv "MT_TARGET" target) 90 (setenv "MT_TARGET" target) 91 (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir- 91 (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir- 92 < > 92 (change-directory top-path) 93 (if (not (setup-for-run)) 93 (if (not (setup-for-run)) 94 (begin 94 (begin 95 (debug:print 0 "Failed to setup, exiting") 95 (debug:print 0 "Failed to setup, exiting") 96 (exit 1))) 96 (exit 1))) > 97 (change-directory *toppath*) 97 ;; now can find our db 98 ;; now can find our db 98 (set! db (open-db)) 99 (set! db (open-db)) 99 (if (not (args:get-arg "-server")) 100 (if (not (args:get-arg "-server")) 100 (server:client-setup db)) 101 (server:client-setup db)) 101 ;; (set! *cache-on* #t) 102 ;; (set! *cache-on* #t) 102 (set-megatest-env-vars db run-id) ;; these may be needed by the launch 103 (set-megatest-env-vars db run-id) ;; these may be needed by the launch 103 (change-directory work-area) 104 (change-directory work-area) ................................................................................................................................................................................ 564 (begin 565 (begin 565 (set! work-area (conc test-path "/tmp_run")) 566 (set! work-area (conc test-path "/tmp_run")) 566 (create-directory work-area #t) 567 (create-directory work-area #t) 567 (debug:print 0 "WARNING: No disk work area specified - running in the 568 (debug:print 0 "WARNING: No disk work area specified - running in the 568 (set! cmdparms (base64:base64-encode (with-output-to-string 569 (set! cmdparms (base64:base64-encode (with-output-to-string 569 (lambda () ;; (list 'hosts hosts) 570 (lambda () ;; (list 'hosts hosts) 570 (write (list (list 'testpath test- 571 (write (list (list 'testpath test- > 572 (list 'toppath *topp 571 (list 'work-area work- 573 (list 'work-area work- 572 (list 'test-name test- 574 (list 'test-name test- 573 (list 'runscript runsc 575 (list 'runscript runsc 574 (list 'run-id run-i 576 (list 'run-id run-i 575 (list 'test-id test- 577 (list 'test-id test- 576 (list 'itemdat itemd 578 (list 'itemdat itemd 577 (list 'megatest remot 579 (list 'megatest remot