Overview
Comment: | wip |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.65-rerun-logpro |
Files: | files | file ages | folders |
SHA1: |
86beaad7468f163c3efd9f7f224e2976 |
User & Date: | bjbarcla on 2018-12-14 16:38:43 |
Other Links: | branch diff | manifest | tags |
Context
2018-12-14
| ||
18:01 | wip check-in: 99dec402d5 user: bjbarcla tags: v1.65-rerun-logpro | |
16:38 | wip check-in: 86beaad746 user: bjbarcla tags: v1.65-rerun-logpro | |
2018-12-13
| ||
15:50 | wip check-in: 386832d442 user: bjbarcla tags: v1.65-rerun-logpro | |
Changes
Modified Makefile from [5f2c7e89a3] to [c26d53fdc7].
︙ | ︙ | |||
113 114 115 116 117 118 119 | runconfig.o \ runs.o \ server.o \ tasks.o \ tdb.o \ tests.o \ subrun.o \ | | > | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | runconfig.o \ runs.o \ server.o \ tasks.o \ tdb.o \ tests.o \ subrun.o \ ezsteps.o \ redo-logpro.o tcmt : $(TCMTOBJS) tcmt.scm csc $(CSCOPTS) $(TCMTOBJS) tcmt.scm -o tcmt # install documentation to $(PREFIX)/docs # DOES NOT REBUILD DOCS # |
︙ | ︙ |
Modified common.scm from [f3a824a935] to [a785fb6863].
︙ | ︙ | |||
82 83 84 85 86 87 88 89 90 91 92 93 94 95 | (length (filter identity (map socket? (glob (conc "/proc/" pid "/fd/*"))))) ) ) ;; GLOBALS ;; CONTEXTS (defstruct cxt (taskdb #f) (cmutex (make-mutex))) ;; (define *contexts* (make-hash-table)) ;; (define *context-mutex* (make-mutex)) | > > > | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | (length (filter identity (map socket? (glob (conc "/proc/" pid "/fd/*"))))) ) ) ;; GLOBALS ;; job exit info (defstruct launch:einf (pid #t)(exit-status #t)(exit-code #t)(rollup-status 0)) ;; CONTEXTS (defstruct cxt (taskdb #f) (cmutex (make-mutex))) ;; (define *contexts* (make-hash-table)) ;; (define *context-mutex* (make-mutex)) |
︙ | ︙ |
Modified ezsteps.scm from [5d1c395435] to [2c6b60e83e].
︙ | ︙ | |||
33 34 35 36 37 38 39 | (include "key_records.scm") (include "db_records.scm") (include "run_records.scm") ;;(rmt:get-test-info-by-id run-id test-id) -> testdat | | < | > > > > | | > > > > > > > > > | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | (include "key_records.scm") (include "db_records.scm") (include "run_records.scm") ;;(rmt:get-test-info-by-id run-id test-id) -> testdat (define (ezsteps:runstep ezstep run-id test-id exit-info-in in-mutex is-last-step testconfig-in) ;; m - a mutex object (why?) (let* ((m (or in-mutex (make-mutex))) (exit-info (or exit-info-in (make-launch:einf pid: #t exit-status: #t exit-code: #t rollup-status: 0))) ;; pid exit-status exit-code (i.e. process was successfully run) rollup-status (testconfig (or testconfig-in (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t))) (ezsteplst (hash-table-ref/default testconfig "ezsteps" '())) (stepname (if (list? ezsteplst) (car ezstep) ezstep)) ;; do stuff to run the step (stepinfo (if (list? ezsteplst) (cadr ezstep) (let loop ((tocheck ezsteplst)) (cond ((null? tocheck) #f) ((equal? (caar tocheck) ezstep) (cadar tocheck)) (else (loop (cdr tocheck)))))))) (if stepinfo (let* ( ;; (let ((info (cadr ezstep))) ;; (if (proc? info) "" info))) ;; (stepproc (let ((info (cadr ezstep))) ;; (if (proc? info) info #f))) (stepparts (string-match (regexp "^(\\{([^\\}\\{]*)\\}\\s*|)(.*)$") stepinfo)) (stepparams (list-ref stepparts 2)) ;; for future use, {VAR=1,2,3}, run step for each (paramparts (if (string? stepparams) |
︙ | ︙ | |||
173 174 175 176 177 178 179 | ((eq? overall-status 'pass) this-step-status) ((eq? overall-status 'warn) (if (eq? this-step-status 'fail) 'fail 'warn)) ((eq? overall-status 'abort) 'abort) (else 'fail))) (next-state ;; "RUNNING") ;; WHY WAS THIS CHANGED TO NOT USE (null? tal) ?? (cond | | | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 | ((eq? overall-status 'pass) this-step-status) ((eq? overall-status 'warn) (if (eq? this-step-status 'fail) 'fail 'warn)) ((eq? overall-status 'abort) 'abort) (else 'fail))) (next-state ;; "RUNNING") ;; WHY WAS THIS CHANGED TO NOT USE (null? tal) ?? (cond (is-last-step ;; more to run? "COMPLETED") (else "RUNNING")))) (debug:print 4 *default-log-port* "Exit value received: " (launch:einf-exit-code exit-info) " logpro-used: " logpro-used " this-step-status: " this-step-status " overall-status: " overall-status " next-status: " next-status " rollup-status: " (launch:einf-rollup-status exit-info)) ;; (vector-ref exit-info 3)) (case next-status ((warn) |
︙ | ︙ | |||
216 217 218 219 220 221 222 | #f)) ((pass) (tests:test-set-status! run-id test-id next-state "PASS" #f #f)) (else ;; 'fail (launch:einf-rollup-status-set! exit-info 1) ;; (vector-set! exit-info 3 1) ;; force fail, this used to be next-state but that doesn't make sense. should always be "COMPLETED" (tests:test-set-status! run-id test-id "COMPLETED" "FAIL" (conc "Failed at step " stepname) #f) ))) | | > > > | 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | #f)) ((pass) (tests:test-set-status! run-id test-id next-state "PASS" #f #f)) (else ;; 'fail (launch:einf-rollup-status-set! exit-info 1) ;; (vector-set! exit-info 3 1) ;; force fail, this used to be next-state but that doesn't make sense. should always be "COMPLETED" (tests:test-set-status! run-id test-id "COMPLETED" "FAIL" (conc "Failed at step " stepname) #f) ))) logpro-used) (begin (debug:print-error 0 *default-log-port* "ezstep named "ezstep" does not exist for testid="test-id) #f)))) (define (ezsteps:run-from testdat start-step-name-in run-one #!key (rerun-logpro-only #f) ) ;; TODO: honor rerun-logpro-only (if rerun-logpro-only (BB> "someday soon...") (let* ((test-run-dir ;; (filedb:get-path *fdb* (db:test-get-rundir testdat)) ;; ) |
︙ | ︙ |
Modified launch.scm from [5f4f2eac33] to [a27003c329].
︙ | ︙ | |||
28 29 30 31 32 33 34 | (import (prefix sqlite3 sqlite3:)) (declare (unit launch)) (declare (uses subrun)) (declare (uses common)) (declare (uses configf)) (declare (uses db)) | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | (import (prefix sqlite3 sqlite3:)) (declare (unit launch)) (declare (uses subrun)) (declare (uses common)) (declare (uses configf)) (declare (uses db)) (declare (uses ezsteps)) ;; why does this break things? (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") ;;====================================================================== ;; ezsteps ;;====================================================================== |
︙ | ︙ | |||
58 59 60 61 62 63 64 | (define (launch:get-cmdinfo-assoc-list #!key (encoded-cmd #f)) (let ((enccmd (if encoded-cmd encoded-cmd (getenv "MT_CMDINFO")))) (if enccmd (common:read-encoded-string enccmd) '()))) ;; 0 1 2 3 | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | (define (launch:get-cmdinfo-assoc-list #!key (encoded-cmd #f)) (let ((enccmd (if encoded-cmd encoded-cmd (getenv "MT_CMDINFO")))) (if enccmd (common:read-encoded-string enccmd) '()))) ;; 0 1 2 3 ;; return (conc status ": " comment) from the final section so that ;; the comment can be set in the step record in launch.scm ;; (define (launch:load-logpro-dat run-id test-id stepname) (let ((cname (conc stepname ".dat"))) (if (common:file-exists? cname) |
︙ | ︙ |
Modified redo-logpro.scm from [dcdaae39cb] to [a5ea76c87d].
︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 | (use fmt) (use ducttape-lib) (define css "") (define (redo-logpro:redo-logpro run-id test-id testdat) ;; TODO: populate testdat from testid, start-step-name (from first step) ;; TODO: (ezsteps:run-from testdat start-step-name #f rerun-logpro-only: #t)) (BB> "redo-logpro:redo-logpro called with run-id="run-id" test-id="test-id" testdat="testdat) (ezsteps:run-from testdat #f #f rerun-logpro-only: #t) (print "redo-logpro Unimplemented") #f) | > | 25 26 27 28 29 30 31 32 33 34 35 36 37 | (use fmt) (use ducttape-lib) (define css "") (define (redo-logpro:redo-logpro run-id test-id testdat) ;; TODO: populate testdat from testid, start-step-name (from first step) ;; TODO: (ezsteps:run-from testdat start-step-name #f rerun-logpro-only: #t)) (BB> "redo-logpro:redo-logpro called with run-id="run-id" test-id="test-id" testdat="testdat) (ezsteps:run-from testdat #f #f rerun-logpro-only: #t) (print "redo-logpro Unimplemented") #f) |