Check-in [ef011a974f]
Not logged in
Overview
SHA1 Hash:ef011a974fbdb2ad21bd1b7432b2dacc4461fc14
Date: 2012-04-02 09:09:07
User: mrwellan
Comment:Merged in debug improvement, debug is now passed on to the test execution
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | manifest
Tags And Properties
Changes

Modified launch.scm from [8808c31a38d465d9] to [c6d7662106aeaf10].

514 (toptest-work-area #f) ;; for iterated tests the top test contains data 514 (toptest-work-area #f) ;; for iterated tests the top test contains data 515 (diskpath #f) 515 (diskpath #f) 516 (cmdparms #f) 516 (cmdparms #f) 517 (fullcmd #f) ;; (define a (with-output-to-string (lambda ()(write x) 517 (fullcmd #f) ;; (define a (with-output-to-string (lambda ()(write x) 518 (mt-bindir-path #f) 518 (mt-bindir-path #f) 519 (item-path (item-list->path itemdat)) 519 (item-path (item-list->path itemdat)) 520 (testinfo (rdb:get-test-info db run-id test-name item-path)) 520 (testinfo (rdb:get-test-info db run-id test-name item-path)) 521 (test-id (db:test-get-id testinfo))) | 521 (test-id (db:test-get-id testinfo)) > 522 (debug-param (if (args:get-arg "-debug")(list "-debug" (args:get-arg "- 522 (if hosts (set! hosts (string-split hosts))) 523 (if hosts (set! hosts (string-split hosts))) 523 ;; set the megatest to be called on the remote host 524 ;; set the megatest to be called on the remote host 524 (if (not remote-megatest)(set! remote-megatest local-megatest)) ;; "megatest 525 (if (not remote-megatest)(set! remote-megatest local-megatest)) ;; "megatest 525 (set! mt-bindir-path (pathname-directory remote-megatest)) 526 (set! mt-bindir-path (pathname-directory remote-megatest)) 526 (if launcher (set! launcher (string-split launcher))) 527 (if launcher (set! launcher (string-split launcher))) 527 ;; set up the run work area for this test 528 ;; set up the run work area for this test 528 (set! diskpath (get-best-disk *configdat*)) 529 (set! diskpath (get-best-disk *configdat*)) ................................................................................................................................................................................ 551 (list 'runname runname) 552 (list 'runname runname) 552 (list 'mt-bindir-path mt-bind 553 (list 'mt-bindir-path mt-bind 553 ;; clean out step records from previous run if they exist 554 ;; clean out step records from previous run if they exist 554 (db:delete-test-step-records db run-id test-name itemdat) 555 (db:delete-test-step-records db run-id test-name itemdat) 555 (change-directory work-area) ;; so that log files from the launch process do 556 (change-directory work-area) ;; so that log files from the launch process do 556 (cond 557 (cond 557 ((and launcher hosts) ;; must be using ssh hostname 558 ((and launcher hosts) ;; must be using ssh hostname > 559 (set! fullcmd (append launcher (car hosts)(list remote-megatest test-sig " 558 (set! fullcmd (append launcher (car hosts)(list remote-megatest test-sig " | 560 ;; (set! fullcmd (append launcher (car hosts)(list remote-megatest test-si 559 (launcher 561 (launcher > 562 (set! fullcmd (append launcher (list remote-megatest test-sig "-execute" c 560 (set! fullcmd (append launcher (list remote-megatest test-sig "-execute" c | 563 ;; (set! fullcmd (append launcher (list remote-megatest test-sig "-execute 561 (else 564 (else 562 (if (not useshell)(debug:print 0 "WARNING: internal launching will not wor 565 (if (not useshell)(debug:print 0 "WARNING: internal launching will not wor > 566 (set! fullcmd (append (list remote-megatest test-sig "-execute" cmdparms) 563 (set! fullcmd (list remote-megatest test-sig "-execute" cmdparms (if usesh | 567 ;; (set! fullcmd (list remote-megatest test-sig "-execute" cmdparms (if us 564 (if (args:get-arg "-xterm")(set! fullcmd (append fullcmd (list "-xterm")))) 568 (if (args:get-arg "-xterm")(set! fullcmd (append fullcmd (list "-xterm")))) 565 (debug:print 1 "Launching megatest for test " test-name " in " work-area" .. 569 (debug:print 1 "Launching megatest for test " test-name " in " work-area" .. 566 (test-set-status! db test-id "LAUNCHED" "n/a" #f #f) ;; (if launch-results l 570 (test-set-status! db test-id "LAUNCHED" "n/a" #f #f) ;; (if launch-results l 567 ;; set pre-launch-env-vars before launching, keep the vars in prevvals and p 571 ;; set pre-launch-env-vars before launching, keep the vars in prevvals and p 568 (debug:print 4 "fullcmd: " fullcmd) 572 (debug:print 4 "fullcmd: " fullcmd) 569 (let* ((commonprevvals (alist->env-vars 573 (let* ((commonprevvals (alist->env-vars 570 (hash-table-ref/default *configdat* "env-override" ' 574 (hash-table-ref/default *configdat* "env-override" '