Overview
| Comment: | Fixed the ../megatest ../dashboard issue. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65-broken |
| Files: | files | file ages | folders |
| SHA1: |
19f75192e22ab76c4de3eacbf57416d1 |
| User & Date: | mrwellan on 2020-05-04 16:06:07 |
| Other Links: | branch diff | manifest | tags |
Context
|
2020-05-04
| ||
| 22:51 | Added -include support for archive get check-in: 63e558983a user: mrwellan tags: v1.65-broken | |
| 16:06 | Fixed the ../megatest ../dashboard issue. check-in: 19f75192e2 user: mrwellan tags: v1.65-broken | |
| 14:02 | Fix issue with megatest finding it's own exectuable under dashboard (triggered by recent build improvements) check-in: 8fd408420b user: mrwellan tags: v1.65-broken | |
Changes
Modified common.scm from [a60f4b1566] to [ee85f9ff78].
| ︙ | ︙ | |||
230 231 232 233 234 235 236 | (define *common:this-exe-fullpath* (common:get-this-exe-fullpath)) (define *common:this-exe-dir* (pathname-directory *common:this-exe-fullpath*)) (define *common:this-exe-name* (pathname-strip-directory *common:this-exe-fullpath*)) ;; when called from a wrapper I need sometimes to find the calling ;; wrapper, this is for dashboard to find the correct megatest. ;; | | | | | | | | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 |
(define *common:this-exe-fullpath* (common:get-this-exe-fullpath))
(define *common:this-exe-dir* (pathname-directory *common:this-exe-fullpath*))
(define *common:this-exe-name* (pathname-strip-directory *common:this-exe-fullpath*))
;; when called from a wrapper I need sometimes to find the calling
;; wrapper, this is for dashboard to find the correct megatest.
;;
(define (common:find-local-megatest #!optional (progname "megatest"))
(let ((res (filter file-exists?
(map (lambda (updir)
(let* ((lm (car (argv)))
(dir (pathname-directory lm))
(exe (pathname-strip-directory lm)))
(conc (if dir (conc dir "/") "")
(case (string->symbol exe)
((dboard) (conc updir progname))
((mtest) (conc updir progname))
((dashboard) progname)
(else exe)))))
'("../../" "../")))))
(if (null? res)
(begin
(debug:print 0 *current-log-port* "Failed to find this executable! Using what can be found on the path")
progname)
(car res))))
(define *common:logpro-exit-code->status-sym-alist*
'( ( 0 . pass )
( 1 . fail )
( 2 . warn )
( 3 . check )
|
| ︙ | ︙ |
Modified dashboard-context-menu.scm from [0a1e7c69d9] to [ea92cc86d4].
| ︙ | ︙ | |||
43 44 45 46 47 48 49 | (declare (uses subrun)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (define (dboard:launch-testpanel run-id test-id) | | | < < < < < < < | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
(declare (uses subrun))
(include "common_records.scm")
(include "db_records.scm")
(include "run_records.scm")
(define (dboard:launch-testpanel run-id test-id)
(let* ((dboardexe (common:find-local-megatest "dashboard"))
(cmd (conc dboardexe
" -test " run-id "," test-id
" &")))
(system cmd)))
(define (dashboard:run-menu-items run-id test-id target runname test-name testpatt item-test-path test-info)
(list
(iup:menu-item
|
| ︙ | ︙ |
Modified megatest.scm from [4b27fb4644] to [6278a546f3].
| ︙ | ︙ | |||
122 123 124 125 126 127 128 |
-version : print megatest version (currently " megatest-version ")
Launching and managing runs
-run : run all tests or as specified by -testpatt
-remove-runs : remove the data for a run, requires -runname and -testpatt
Optionally use :state and :status, use -keep-records to remove only
the run data. Use -kill-wait to override the 10 second
| | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 |
-version : print megatest version (currently " megatest-version ")
Launching and managing runs
-run : run all tests or as specified by -testpatt
-remove-runs : remove the data for a run, requires -runname and -testpatt
Optionally use :state and :status, use -keep-records to remove only
the run data. Use -kill-wait to override the 10 second
per test wait after kill delay (e.g. -kill-wait 0).
-kill-runs : kill existing run(s) (all incomplete tests killed)
-kill-rerun : kill an existing run (all incomplete tests killed and run is rerun)
-set-state-status X,Y : set state to X and status to Y, requires controls per -remove-runs
-rerun FAIL,WARN... : force re-run for tests with specificed status(s)
-rerun-clean : set all tests not COMPLETED+PASS,WARN,WAIVED to NOT_STARTED,n/a
and then run the specified testpatt with -preclean
-rerun-all : set all tests to NOT_STARTED,n/a and run with -preclean
|
| ︙ | ︙ |
Modified runs.scm from [04a7c3fd06] to [5d58c5f129].
| ︙ | ︙ | |||
2337 2338 2339 2340 2341 2342 2343 |
(if (null? tal)
(loop new-test-dat tal)
(loop (car tal)(append tal (list new-test-dat)))))
(begin
(set! lasttpath (db:test-get-rundir new-test-dat)) ;; remember this path for run removal
(if (file-exists? lasttpath)
(set! lastrealpath (resolve-pathname lasttpath))
| | < | 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 |
(if (null? tal)
(loop new-test-dat tal)
(loop (car tal)(append tal (list new-test-dat)))))
(begin
(set! lasttpath (db:test-get-rundir new-test-dat)) ;; remember this path for run removal
(if (file-exists? lasttpath)
(set! lastrealpath (resolve-pathname lasttpath))
(set! lastrealpath lasttpath))
(runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
(if (not (null? tal))
(loop (car tal)(cdr tal)))))))
(rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
((kill-runs)
;; RUNNING -> KILLREQ
|
| ︙ | ︙ |