Overview
| Comment: | Launching subrun dashboard prefiltered to only show the run of interest now works |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65-dashboard-prefilter |
| Files: | files | file ages | folders |
| SHA1: |
e16b8946d5093701ea84b769ec1d7f8c |
| User & Date: | mrwellan on 2021-01-05 21:56:56 |
| Other Links: | branch diff | manifest | tags |
Context
|
2021-01-05
| ||
| 21:57 | Merged v1.65-dashboard-prefilter Closed-Leaf check-in: 206d14bb44 user: mrwellan tags: v1.65 | |
| 21:56 | Launching subrun dashboard prefiltered to only show the run of interest now works Leaf check-in: e16b8946d5 user: mrwellan tags: v1.65-dashboard-prefilter | |
| 21:11 | -target and -runname working for dashboard check-in: e1f0d4828d user: mrwellan tags: v1.65-dashboard-prefilter | |
Changes
Modified dashboard-tests.scm from [775d2ec086] to [e1041b5905].
| ︙ | ︙ | |||
259 260 261 262 263 264 265 | ))))) ;; if there is a submegatest create a button to launch dashboard in that area ;; (define (submegatest-panel dbstruct keydat testdat runname testconfig) (let* ((test-run-dir (db:test-get-rundir testdat)) (subarea (subrun:get-runarea test-run-dir)) | | > > > > > > | > > > > | | > | | | | > > > > | | 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 |
)))))
;; if there is a submegatest create a button to launch dashboard in that area
;;
(define (submegatest-panel dbstruct keydat testdat runname testconfig)
(let* ((test-run-dir (db:test-get-rundir testdat))
(subarea (subrun:get-runarea test-run-dir))
(area-exists (and subarea (common:file-exists? subarea silent: #t)))
(target #f)
(runname #f)
(cmd-parts-file (conc test-run-dir "/subrun-command-parts.sexp")))
(if (file-exists? cmd-parts-file) ;; existance of this file is sufficient to *try* opening a dashboard
(let* ((cmd-parts (if (file-exists? cmd-parts-file)
(with-input-from-file cmd-parts-file
read)
'()))
(target (alist-ref "-target" cmd-parts equal?))
(runname (alist-ref "-runname" cmd-parts equal?))
(run-area (alist-ref "-startdir" cmd-parts equal?)))
(iup:frame
#:title "Megatest Run Info" ; #:expand "YES"
(iup:vbox
(iup:button
"Launch Dashboard"
#:action (lambda (obj)
(subrun:launch-dashboard test-run-dir)))
(iup:button
"Launch Dashboard+Filter"
#:action (lambda (obj)
(subrun:launch-dashboard test-run-dir target: target runname: runname))))))
(iup:vbox ))))
;; use a global for setting the buttons colors
;; state status teststeps
(define *state-status* (vector #f #f #f))
(define (update-state-status-buttons testdat)
(let* ((state (db:test-get-state testdat))
(status (db:test-get-status testdat))
|
| ︙ | ︙ |
Modified subrun.scm from [bd1952a98c] to [0aa479705e].
| ︙ | ︙ | |||
41 42 43 44 45 46 47 |
(define (subrun:subrun-test-initialized? test-run-dir)
(if (and (common:file-exists? (conc test-run-dir "/subrun-area") )
(common:file-exists? (conc test-run-dir "/testconfig.subrun") ))
#t
#f))
| | | > > | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 |
(define (subrun:subrun-test-initialized? test-run-dir)
(if (and (common:file-exists? (conc test-run-dir "/subrun-area") )
(common:file-exists? (conc test-run-dir "/testconfig.subrun") ))
#t
#f))
(define (subrun:launch-dashboard test-run-dir #!key (target #f)(runname #f))
(if (subrun:subrun-test-initialized? test-run-dir)
(let* ((subarea (subrun:get-runarea test-run-dir))
(params (conc (if target (conc " -target " target) "")
(if runname (conc " -runname " runname) ""))))
(if (and subarea (common:file-exists? subarea))
(system (conc "cd " subarea ";env -i PATH=$PATH DISPLAY=$DISPLAY HOME=$HOME USER=$USER nbfake dashboard " params))))))
(define (subrun:subrun-removed? test-run-dir)
(if (subrun:subrun-test-initialized? test-run-dir)
(let ((flagfile (conc test-run-dir "/subrun.removed")))
(if (common:file-exists? flagfile)
#t
#f))
|
| ︙ | ︙ | |||
207 208 209 210 211 212 213 |
;; swap out testpatt with modified test-patt and add -log
(switch-alist (cons
(cons "-log" logfile)
(map (lambda (item)
(if (equal? (car item) "-testpatt")
(cons "-testpatt" testpatt)
item))
| | > > > | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 |
;; swap out testpatt with modified test-patt and add -log
(switch-alist (cons
(cons "-log" logfile)
(map (lambda (item)
(if (equal? (car item) "-testpatt")
(cons "-testpatt" testpatt)
item))
switch-alist-pre))))
(with-output-to-file "subrun-command-parts.sexp"
(lambda ()
(pp switch-alist)))
switch-alist))
;; note - get precmd from subrun section
;; apply to submegatest commands
(define (subrun:get-log-path test-run-dir log-prefix)
(let* ((alist (subrun:selector+log-alist test-run-dir log-prefix))
(res (alist-ref "-log" alist equal? #f)))
|
| ︙ | ︙ |