Skip to content

Commit e52cab2

Browse files
author
mrwellan
committed
Merged popup_menu into v1.61
2 parents 6ae8b18 + fb8d488 commit e52cab2

File tree

2 files changed

+35
-6
lines changed

2 files changed

+35
-6
lines changed

dashboard-tests.scm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@
601601
command-text-box "VALUE"
602602
(conc "megatest -target " keystring " -runname " runname
603603
" -set-state-status KILLREQ,n/a -testpatt %/% "
604-
" -state RUNNING"))))
604+
" -state RUNNING,REMOTEHOSTSTART,LAUNCHED"))))
605605
(run-test (lambda (x)
606606
(iup:attribute-set!
607607
command-text-box "VALUE"

dashboard.scm

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2082,12 +2082,22 @@ Misc
20822082
(conc "Rerun " testpatt)
20832083
#:action
20842084
(lambda (obj)
2085+
;;(print "buttndat: " buttndat " run-id: " run-id " test-id: " test-id " target: " target " runname: " runname " test-name: " test-name " testpatt: " testpatt)
20852086
(common:run-a-command
20862087
(conc "megatest -run -target " target
20872088
" -runname " runname
20882089
" -testpatt " testpatt
20892090
" -preclean -clean-cache")
2090-
)))))
2091+
)))
2092+
(iup:menu-item
2093+
"Rerun Complete Run"
2094+
#:action
2095+
(lambda (obj)
2096+
(common:run-a-command
2097+
(conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target
2098+
" -runname " runname
2099+
" -testpatt % "
2100+
" -preclean -clean-cache"))))))
20912101
(iup:menu-item
20922102
"Test"
20932103
(iup:menu
@@ -2096,16 +2106,35 @@ Misc
20962106
#:action
20972107
(lambda (obj)
20982108
(common:run-a-command
2099-
(conc "megatest -run -target " target
2100-
" -runname " runname
2109+
(conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target
2110+
" -runname " runname
21012111
" -testpatt " test-name
21022112
" -preclean -clean-cache"))))
2113+
(iup:menu-item
2114+
(conc "Kill " test-name)
2115+
#:action
2116+
(lambda (obj)
2117+
;; (rmt:test-set-state-status-by-id run-id test-id "KILLREQ" #f #f)
2118+
(common:run-a-command
2119+
(conc "megatest -set-state-status KILLREQ,n/a -target " target
2120+
" -runname " runname
2121+
" -testpatt " test-name
2122+
" -state RUNNING,REMOTEHOSTSTART,LAUNCHED"))))
2123+
(iup:menu-item
2124+
(conc "Clean " test-name)
2125+
#:action
2126+
(lambda (obj)
2127+
(common:run-a-command
2128+
(conc "megatest -remove-runs -target " target
2129+
" -runname " runname
2130+
" -testpatt " test-name))))
21032131
(iup:menu-item
21042132
"Start xterm"
21052133
#:action
21062134
(lambda (obj)
2107-
(let* ((cmd (conc (car (argv)) " -xterm " run-id "," test-id "&")))
2108-
(system cmd))))
2135+
(dcommon:examine-xterm run-id test-id)))
2136+
;;(let* ((cmd (conc (car (argv)) " -xterm " run-id "," test-id "&")))
2137+
;; (system cmd))))
21092138
(iup:menu-item
21102139
"Edit testconfig"
21112140
#:action

0 commit comments

Comments
 (0)