Overview
| Comment: | variable propogation fix |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65 |
| Files: | files | file ages | folders |
| SHA1: |
b156cc02a8ccbe5eadfeab2eaf2e456c |
| User & Date: | pjhatwal on 2020-10-16 18:09:31 |
| Other Links: | branch diff | manifest | tags |
Context
|
2020-10-17
| ||
| 00:46 | Added speculative dynamically calculated delay to reduce db hammering check-in: 41eeb0e45f user: matt tags: v1.65 | |
|
2020-10-16
| ||
| 18:09 | variable propogation fix check-in: b156cc02a8 user: pjhatwal tags: v1.65 | |
|
2020-10-13
| ||
| 16:46 | Changed version from 69 to 76. No other changes. Will compile with chicken 13 check-in: 87ca35010f user: mmgraham tags: v1.65, v1.6576 | |
Changes
Modified common.scm from [33c7316880] to [7199c76f8e].
| ︙ | ︙ | |||
2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 |
((string? proc)(system proc))
(proc (proc)))
(hash-table-for-each
vars
(lambda (var val)
(setenv var val)))
vars))
(define (common:run-a-command cmd #!key (with-vars #f) (with-orig-env #f))
(let* ((pre-cmd (dtests:get-pre-command))
(post-cmd (dtests:get-post-command))
(fullcmd (if (or pre-cmd post-cmd)
(conc pre-cmd cmd post-cmd)
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 |
((string? proc)(system proc))
(proc (proc)))
(hash-table-for-each
vars
(lambda (var val)
(setenv var val)))
vars))
(define (common:propogate-mt-vars-to-subrun proc propogate-vars)
(let ((vars (make-hash-table))
(var-patt "^MT_.*"))
(for-each
(lambda (vardat) ;; each env var
;(for-each
;(lambda (var-patt)
(if (string-match var-patt (car vardat))
(let ((var (car vardat))
(val (cdr vardat)))
(hash-table-set! vars var val)
(if (member var propogate-vars)
(begin
(print var " " (string-substitute "MT_" "PARENT_" var))
(setenv (string-substitute "MT_" "PARENT_" var) val)))
(unsetenv var))))
; var-patts))
(get-environment-variables))
(cond
((string? proc)(system proc))
(proc (proc)))
(hash-table-for-each
vars
(lambda (var val)
(if (member var propogate-vars)
(unsetenv (string-substitute "MT_" "PARENT_" var)))
(setenv var val)))
vars))
(define (common:run-a-command cmd #!key (with-vars #f) (with-orig-env #f))
(let* ((pre-cmd (dtests:get-pre-command))
(post-cmd (dtests:get-post-command))
(fullcmd (if (or pre-cmd post-cmd)
(conc pre-cmd cmd post-cmd)
|
| ︙ | ︙ |
Modified ezsteps.scm from [5de5d166c7] to [ef12da0318].
| ︙ | ︙ | |||
103 104 105 106 107 108 109 |
(let* ((cmd (conc stepcmd " > " stepname ".log 2>&1")) ;; >outfile 2>&1
(pid #f))
(let ((proc (lambda ()
(set! pid (process-run "/bin/bash" (list "-c" cmd))))))
(if subrun
(begin
(debug:print-info 0 *default-log-port* "Running without MT_.* environment variables.")
| | | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 |
(let* ((cmd (conc stepcmd " > " stepname ".log 2>&1")) ;; >outfile 2>&1
(pid #f))
(let ((proc (lambda ()
(set! pid (process-run "/bin/bash" (list "-c" cmd))))))
(if subrun
(begin
(debug:print-info 0 *default-log-port* "Running without MT_.* environment variables.")
(common:propogate-mt-vars-to-subrun proc '("MT_TARGET" "MT_LINKTREE" "MT_RUNNAME")))
(proc)))
(with-output-to-file "Makefile.ezsteps"
(lambda ()
(print stepname ".log :")
(print "\t" cmd)
(if (common:file-exists? (conc stepname ".logpro"))
|
| ︙ | ︙ |
Modified megatest.scm from [0e58f17e0f] to [16327ccad9].
| ︙ | ︙ | |||
521 522 523 524 525 526 527 528 529 530 531 532 533 534 |
"-show-runconfig"
"-show-config"
"-show-cmdinfo"
"-cleanup-db"))
(no-watchdog-args-vals (filter (lambda (x) x)
(map args:get-arg no-watchdog-args)))
(start-watchdog (null? no-watchdog-args-vals)))
;;(BB> "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals)
(if start-watchdog
(thread-start! *watchdog*)))
;; bracket open-output-file with code to make leading directory if it does not exist and handle exceptions
(define (open-logfile logpath-in)
| > | 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 |
"-show-runconfig"
"-show-config"
"-show-cmdinfo"
"-cleanup-db"))
(no-watchdog-args-vals (filter (lambda (x) x)
(map args:get-arg no-watchdog-args)))
(start-watchdog (null? no-watchdog-args-vals)))
;(print "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals " start-watchdog-specail-arg-val:" start-watchdog-specail-arg-val " start-watchdog:" start-watchdog)
;;(BB> "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals)
(if start-watchdog
(thread-start! *watchdog*)))
;; bracket open-output-file with code to make leading directory if it does not exist and handle exceptions
(define (open-logfile logpath-in)
|
| ︙ | ︙ |
Modified utils/remrun from [7a107135c8] to [c7d387d56c].
| ︙ | ︙ | |||
38 39 40 41 42 43 44 | __EOF exit fi export NBFAKE_HOST=$1 shift | > > > > > > | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 |
__EOF
exit
fi
export NBFAKE_HOST=$1
shift
cmd=""
for var in $(env | egrep "^(PARENT_|MT_)"|cut -d= -f1);do
new_var="`echo ${!var}`"
cmd="$cmd export $var=$new_var;"
done
cmd="$cmd $*"
exec nbfake $cmd
|