Overview
| SHA1 Hash: | 699412032b31b6ef3803ef2a3b4a8365fca8c98c |
|---|---|
| Date: | 2012-06-15 12:05:01 |
| User: | mrwellan |
| Comment: | Added additional vars to launch environment and changed dirs |
| 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]
Changes
Modified launch.scm from [ec07a7aa76f7b587] to [1cab37c931b40cb5].
535 (diskpath #f) 535 (diskpath #f) 536 (cmdparms #f) 536 (cmdparms #f) 537 (fullcmd #f) ;; (define a (with-output-to-string (lambda ()(write x) 537 (fullcmd #f) ;; (define a (with-output-to-string (lambda ()(write x) 538 (mt-bindir-path #f) 538 (mt-bindir-path #f) 539 (item-path (item-list->path itemdat)) 539 (item-path (item-list->path itemdat)) 540 (testinfo (rdb:get-test-info db run-id test-name item-path)) 540 (testinfo (rdb:get-test-info db run-id test-name item-path)) 541 (test-id (db:test-get-id testinfo)) 541 (test-id (db:test-get-id testinfo)) > 542 (mt_target (string-intersperse (map cadr keyvallst) "/")) 542 (debug-param (if (args:get-arg "-debug")(list "-debug" (args:get-arg "- 543 (debug-param (if (args:get-arg "-debug")(list "-debug" (args:get-arg "- 543 (if hosts (set! hosts (string-split hosts))) 544 (if hosts (set! hosts (string-split hosts))) 544 ;; set the megatest to be called on the remote host 545 ;; set the megatest to be called on the remote host 545 (if (not remote-megatest)(set! remote-megatest local-megatest)) ;; "megatest 546 (if (not remote-megatest)(set! remote-megatest local-megatest)) ;; "megatest 546 (set! mt-bindir-path (pathname-directory remote-megatest)) 547 (set! mt-bindir-path (pathname-directory remote-megatest)) 547 (if launcher (set! launcher (string-split launcher))) 548 (if launcher (set! launcher (string-split launcher))) 548 ;; set up the run work area for this test 549 ;; set up the run work area for this test ................................................................................................................................................................................ 563 (list 'test-name test- 564 (list 'test-name test- 564 (list 'runscript runsc 565 (list 'runscript runsc 565 (list 'run-id run-i 566 (list 'run-id run-i 566 (list 'test-id test- 567 (list 'test-id test- 567 (list 'itemdat itemd 568 (list 'itemdat itemd 568 (list 'megatest remot 569 (list 'megatest remot 569 (list 'ezsteps ezste 570 (list 'ezsteps ezste 570 (list 'target (stri | 571 (list 'target mt_ta 571 (list 'env-ovrd (hash 572 (list 'env-ovrd (hash 572 (list 'set-vars (if p 573 (list 'set-vars (if p 573 (list 'runname runna 574 (list 'runname runna 574 (list 'mt-bindir-path 575 (list 'mt-bindir-path 575 ;; clean out step records from previous run if they exist 576 ;; clean out step records from previous run if they exist 576 (db:delete-test-step-records db run-id test-name itemdat) 577 (db:delete-test-step-records db run-id test-name itemdat) 577 (change-directory work-area) ;; so that log files from the launch process do 578 (change-directory work-area) ;; so that log files from the launch process do ................................................................................................................................................................................ 592 ;; set pre-launch-env-vars before launching, keep the vars in prevvals and p 593 ;; set pre-launch-env-vars before launching, keep the vars in prevvals and p 593 (debug:print 4 "fullcmd: " fullcmd) 594 (debug:print 4 "fullcmd: " fullcmd) 594 (let* ((commonprevvals (alist->env-vars 595 (let* ((commonprevvals (alist->env-vars 595 (hash-table-ref/default *configdat* "env-override" ' 596 (hash-table-ref/default *configdat* "env-override" ' 596 (testprevvals (alist->env-vars 597 (testprevvals (alist->env-vars 597 (hash-table-ref/default test-conf "pre-launch-env-ov 598 (hash-table-ref/default test-conf "pre-launch-env-ov 598 (miscprevvals (alist->env-vars ;; consolidate this code with the co 599 (miscprevvals (alist->env-vars ;; consolidate this code with the co > 600 (append (list (list "MT_TEST_RUN_DIR" work-area) 599 (append (list (list "MT_TEST_NAME" test-name) | 601 (list "MT_TEST_NAME" test-name) 600 (list "MT_ITEM_INFO" (conc itemdat)) 602 (list "MT_ITEM_INFO" (conc itemdat)) 601 (list "MT_RUNNAME" runname)) | 603 (list "MT_RUNNAME" runname) > 604 (list "MT_TARGET" mt_target) > 605 ) 602 itemdat))) 606 itemdat))) 603 (launch-results (apply cmd-run-proc-each-line 607 (launch-results (apply cmd-run-proc-each-line 604 (if useshell 608 (if useshell 605 (string-intersperse fullcmd " ") 609 (string-intersperse fullcmd " ") 606 (car fullcmd)) 610 (car fullcmd)) 607 print 611 print 608 (if useshell 612 (if useshell 609 '() 613 '() 610 (cdr fullcmd))))) ;; launcher fullcmd))); 614 (cdr fullcmd))))) ;; launcher fullcmd))); > 615 (with-output-to-file "mt_launch.log" > 616 (lambda () > 617 (apply print launch-results))) 611 (debug:print 2 "Launching completed, updating db") 618 (debug:print 2 "Launching completed, updating db") 612 (debug:print 2 "Launch results: " launch-results) 619 (debug:print 2 "Launch results: " launch-results) 613 (if (not launch-results) 620 (if (not launch-results) 614 (begin 621 (begin 615 (print "ERROR: Failed to run " (string-intersperse fullcmd " ") ", e 622 (print "ERROR: Failed to run " (string-intersperse fullcmd " ") ", e 616 (sqlite3:finalize! db) 623 (sqlite3:finalize! db) 617 ;; good ole "exit" seems not to work 624 ;; good ole "exit" seems not to work
Modified tests/fullrun/runconfigs.config from [bc079a5fba591d61] to [bb5d27b847cdc022].
1 [include common_runconfigs.config] | 1 [include #{getenv MT_RUN_AREA_HOME}/common_runconfigs.config] 2 2 3 WACKYVAR0 #{get ubuntu/nfs/none CURRENT} 3 WACKYVAR0 #{get ubuntu/nfs/none CURRENT} 4 WACKYVAR1 #{scheme (args:get-arg "-target")} 4 WACKYVAR1 #{scheme (args:get-arg "-target")} 5 5 6 [default/ubuntu/nfs] 6 [default/ubuntu/nfs] 7 WACKYVAR2 #{runconfigs-get CURRENT} 7 WACKYVAR2 #{runconfigs-get CURRENT} 8 8