Overview
Comment: | Fixed mtutil script trigger to accurately get the new run name and target from the script output |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.65 |
Files: | files | file ages | folders |
SHA1: |
7011408fb5511bc3278fa56429b2f4a4 |
User & Date: | jmoon18 on 2018-05-24 14:34:43 |
Other Links: | branch diff | manifest | tags |
Context
2018-05-24
| ||
17:42 | Initial setup for archive user controlled areas. check-in: 8a75426772 user: mrwellan tags: v1.65 | |
14:34 | Fixed mtutil script trigger to accurately get the new run name and target from the script output check-in: 7011408fb5 user: jmoon18 tags: v1.65 | |
2018-05-23
| ||
14:53 | in script triggers targets need to be returned as list check-in: ee1d5c9fac user: mrwellan tags: v1.65 | |
Changes
Modified mtut.scm from [17da53074e] to [81ee6438b2].
︙ | ︙ | |||
221 222 223 224 225 226 227 | ("-load" . #f) ;; load and exectute a scheme file ("-log" . #f) ("-override-user" . #f) ("-msg" . M) ("-start-dir" . S) ("-set-vars" . v) ("-config" . h) | | | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | ("-load" . #f) ;; load and exectute a scheme file ("-log" . #f) ("-override-user" . #f) ("-msg" . M) ("-start-dir" . S) ("-set-vars" . v) ("-config" . h) ("-time-out" . u) )) (define *switch-keys* '( ("-h" . #f) ("-help" . #f) ("--help" . #f) ("-manual" . #f) |
︙ | ︙ | |||
624 625 626 627 628 629 630 | (cdr (or pmeta smeta)) ;; found it? #f))) (if meta ;; construct the switch/param pair. (list meta value) '()))) (filter cdr args-data))))) | | | 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 | (cdr (or pmeta smeta)) ;; found it? #f))) (if meta ;; construct the switch/param pair. (list meta value) '()))) (filter cdr args-data))))) (print "Alldat: " alldat ) ;;Do not remove. This is uesed by other applications to calculate z card ;(exit) (add-z-card (apply construct-sdat alldat)))) (define (simple-setup start-dir-in) (let* ((start-dir (or start-dir-in ".")) (mtconfig (or (args:get-arg "-config") "megatest.config")) |
︙ | ︙ | |||
719 720 721 722 723 724 725 | (print-call-chain) (print "FAILED TO RUN RUNNAME MAPPER " callname " FOR AREA " area) (print " message: " ((condition-property-accessor 'exn 'message) exn)) runname) (print "(mapper " (string-intersperse (list runkey runname area area-path reason contour mode-patt) ", ") ")") (mapper runkey runname area area-path reason contour mode-patt)) (case callname | | | 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 | (print-call-chain) (print "FAILED TO RUN RUNNAME MAPPER " callname " FOR AREA " area) (print " message: " ((condition-property-accessor 'exn 'message) exn)) runname) (print "(mapper " (string-intersperse (list runkey runname area area-path reason contour mode-patt) ", ") ")") (mapper runkey runname area area-path reason contour mode-patt)) (case callname ((auto #f) runname) (else runtrans))))) (new-target target) ;; I believe we will want target manipulation here .. (map-targets xlatr-key runkey area contour)) (actual-action (if action (if (equal? action "sync-prepend") "sync" action) "run"))) ;; this has gotten a bit ugly. Need a function to handle actions processing. |
︙ | ︙ | |||
917 918 919 920 921 922 923 | (message (if (null? rem-lines) cmd (string-intersperse rem-lines "-"))) (need-run (> last-change last-run))) (print "last-run: " last-run " need-run: " need-run) (if need-run (let* ((key-msg `((message . ,(conc ruletype ":" message)) | | | | 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 | (message (if (null? rem-lines) cmd (string-intersperse rem-lines "-"))) (need-run (> last-change last-run))) (print "last-run: " last-run " need-run: " need-run) (if need-run (let* ((key-msg `((message . ,(conc ruletype ":" message)) (runname . ,new-runname) (runtrans . ,runtrans) (action . ,action) (areas . ,areas) (target . ,(list new-target)) ;; overriding with result from runing the script ))) (print "key-msg: " key-msg) (push-run-spec torun contour (if optional ;; we need to be able to differentiate same contour, different behavior. (conc runkey ":" optional) ;; NOTE: NOT COMPLETELY IMPLEMENTED. DO NOT USE runkey) key-msg))))))) |
︙ | ︙ |