Overview
Context
Changes
Modified dashboard-tests.scm
from [5af85fd903]
to [ef1812a26a].
| ︙ | | |
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
-
+
|
;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
;; PURPOSE.
;;======================================================================
;;======================================================================
;;
;;======================================================================
(define (examine-test db test-id other-thread) ;; run-id run-key origtest)
(define (examine-test db test-id mx1) ;; run-id run-key origtest)
(let* ((testdat (db:get-test-data-by-id db test-id))
(run-id (if testdat (db:test-get-run_id testdat) #f))
(keydat (if testdat (keys:get-key-val-pairs db run-id) #f))
(rundat (if testdat (db:get-run-info db run-id) #f))
(runname (if testdat (db:get-value-by-header (db:get-row rundat)
(db:get-header rundat)
"runname") #f))
|
| ︙ | | |
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
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
|
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
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
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
261
262
263
|
+
-
+
+
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
+
-
-
-
+
+
+
-
+
+
-
+
+
-
+
-
+
-
-
+
+
+
+
-
-
+
+
+
-
+
+
+
+
+
+
-
-
-
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
|
(system (conc "cd " rundir
";xterm -T \"" (string-translate testfullname "()" " ") "\" " shell "&")))
(message-window (conc "Directory " rundir " not found")))))
(refreshdat (lambda ()
(let ((newtestdat (db:get-test-data-by-id db test-id)))
(if newtestdat
(begin
(mutex-lock! mx1)
(set! testdat newtestdat)
(set! teststeps (db:get-steps-for-test db test-id))
(set! logfile (conc (db:test-get-rundir testdat) "/" (db:test-get-final_logf testdat)))
(set! rundir (db:test-get-rundir testdat))
(set! testfullname (db:test-get-fullname testdat)))
(set! testfullname (db:test-get-fullname testdat))
(mutex-unlock! mx1))
(begin
(sqlite3:finalize! db)
(exit 0))))))
(widgets (make-hash-table))
(self #f)
(store-label (lambda (name lbl cmd)
(hash-table-set! widgets name (lambda ()
(iup:attribute-set! lbl "TITLE" (cmd))))
(hash-table-set! widgets name
(lambda ()
(let ((newval (cmd))
(oldval (iup:attribute lbl "TITLE")))
(if (not (equal? newval oldval))
(begin
(mutex-lock! mx1)
(iup:attribute-set! lbl "TITLE" (cmd))
(mutex-unlock! mx1))))))
lbl))
(store-button store-label))
(store-button store-label)
;; Place for new values from the gui
(newstatus #f)
(newstate #f)
(newcomment #f)
)
(cond
((not testdat)(begin (print "ERROR: bad test info for " test-id)(exit 1)))
((not rundat)(begin (print "ERROR: found test info but there is a problem with the run info for " run-id)(exit 1)))
(else
;; (test-set-status! db run-id test-name state status itemdat)
(set! self
(iup:dialog
(set! self ;
(iup:dialog #:close_cb (lambda (a)(exit)) ; #:expand "YES"
#:title testfullname
(iup:hbox #:expand "BOTH" ;; Need a full height box for all the test steps
(iup:vbox #:expand "VERTICAL"
(iup:hbox ; #:expand "YES" ;; Need a full height box for all the test steps
(iup:vbox ; #:expand "YES"
;; The run and test info
(iup:hbox #:expand "BOTH"
(iup:frame #:title "Megatest Run Info" #:expand "VERTICAL"
(iup:hbox #:expand "VERTICAL"
(apply iup:vbox #:expand "VERTICAL"
(iup:hbox ; #:expand "YES"
(iup:frame #:title "Megatest Run Info" ; #:expand "YES"
(iup:hbox ; #:expand "YES"
(apply iup:vbox ; #:expand "YES"
(append (map (lambda (keyval)
(iup:label (conc (car keyval) " ") #:expand "HORIZONTAL"))
(iup:label (conc (car keyval) " ") ; #:expand "HORIZONTAL"
))
keydat)
(list (iup:label "runname "))))
(apply iup:vbox
(append (map (lambda (keyval)
(iup:label (cadr keyval) #:expand "HORIZONTAL"))
keydat)
(list (iup:label runname)(iup:label "" #:expand "VERTICAL"))))))
(iup:frame #:title "Test Info" #:expand "VERTICAL"
(iup:hbox #:expand "VERTICAL"
(apply iup:vbox #:expand "VERTICAL"
(iup:frame #:title "Test Info" ; #:expand "YES"
(iup:hbox ; #:expand "YES"
(apply iup:vbox ; #:expand "YES"
(append (map (lambda (val)
(iup:label val #:expand "HORIZONTAL"))
(iup:label val ; #:expand "HORIZONTAL"
))
(list "Testname: "
"Item path: "
"Current state: "
"Current status: "
"Test comment: "))
"Test comment: "
"Test id: "))
(list (iup:label "" #:expand "VERTICAL"))))
(apply iup:vbox #:expand "BOTH"
(apply iup:vbox ; #:expand "YES"
(list
(iup:label (db:test-get-testname testdat) #:expand "HORIZONTAL")
(iup:label (db:test-get-item-path testdat) #:expand "HORIZONTAL")
(store-label "teststate"
(iup:label (db:test-get-state testdat) #:expand "HORIZONTAL")
(lambda ()
(db:test-get-state testdat)))
(let ((lbl (iup:button (db:test-get-status testdat) #:expand "HORIZONTAL"))
(let ((lbl (iup:label (db:test-get-status testdat) #:expand "HORIZONTAL")))
(color (get-color-for-state-status (db:test-get-state testdat)
(db:test-get-status testdat))))
(iup:attribute-set! lbl "BGCOLOR" color)
(db:test-get-status testdat)))
(iup:attribute-set! lbl "FGCOLOR" (get-color-for-state-status (db:test-get-state testdat)
(db:test-get-status testdat)))
(iup:attribute-set! lbl "TITLE" (db:test-get-status testdat)))))))
lbl)
(store-label "testcomment"
(iup:label "TestComment "
#:expand "HORIZONTAL")
(lambda ()
(db:test-get-comment testdat))))))))
(db:test-get-comment testdat)))
(store-label "testid"
(iup:label "TestId "
#:expand "HORIZONTAL")
(lambda ()
(db:test-get-id testdat))))))))
;; The run host info
(iup:frame #:title "Remote host and Test Run Info" #:expand "HORIZONTAL"
(iup:hbox #:expand "HORIZONTAL"
(apply iup:vbox #:expand "VERTICAL" ;; The heading labels
(iup:frame #:title "Remote host and Test Run Info" ; #:expand "YES"
(iup:hbox ; #:expand "YES"
(apply iup:vbox ; #:expand "YES" ;; The heading labels
(append (map (lambda (val)
(iup:label val #:expand "HORIZONTAL"))
(iup:label val ; #:expand "HORIZONTAL"
))
(list "Hostname: "
"Uname -a: "
"Disk free: "
"CPU Load: "
"Run duration: "
"Logfile: "))
(iup:label "" #:expand "VERTICAL")))
(apply iup:vbox #:expand "VERTICAL"
(apply iup:vbox ; #:expand "YES"
(list
;; NOTE: Yes, the host can change!
(store-label "HostName"
(iup:label (db:test-get-host testdat) #:expand "HORIZONTAL")
(lambda ()(db:test-get-host testdat)))
(store-label "Uname"
(iup:label " " #:expand "HORIZONTAL")
(lambda ()(db:test-get-uname testdat)))
(store-label "DiskFree"
(iup:label (conc (db:test-get-diskfree testdat)) #:expand "HORIZONTAL")
(lambda ()(conc (db:test-get-diskfree testdat))))
(store-label "CPULoad"
(iup:label (conc (db:test-get-cpuload testdat)) #:expand "HORIZONTAL")
(lambda ()(conc (db:test-get-cpuload testdat))))
(store-label "RunDuration"
(iup:label (conc (db:test-get-run_duration testdat)) #:expand "HORIZONTAL")
(lambda ()(conc (db:test-get-run_duration testdat))))
(store-label "CPULoad"
(iup:label (conc (db:test-get-final_logf testdat)) #:expand "HORIZONTAL")
(lambda ()(conc (db:test-get-final_logf testdat))))))))
;; The controls
(iup:frame #:title "Actions" ; #:expand "HORIZONTAL"
(iup:hbox ; #:expand "HORIZONTAL" ;; the actions box
(iup:button "View Log" #:action viewlog #:expand "YES"
)
(iup:button "Start Xterm" #:action xterm #:expand "YES")))
(iup:frame #:title "Set fields"
(iup:vbox
;(iup:hbox ; #:expand "HORIZONTAL"
(iup:hbox (iup:label "Comment:")
(iup:textbox #:action (lambda (val a b)
(set! newcomment b))
#:value (db:test-get-comment testdat)
#:expand "YES"
))
(iup:hbox
(iup:vbox ; for the state and status controls
(iup:hbox ; #:expand "HORIZONTAL" ;; the state
(iup:label "STATE:" ; #:size "30x" ; #:expand "HORIZONTAL"
)
(let ((lb (iup:listbox #:action (lambda (val a b c)
;; (print val " a: " a " b: " b " c: " c)
(set! newstate a))
;; #:editbox "YES"
#:dropdown "YES"
;#:expand "HORIZONTAL"
))))
)))
(iuplistbox-fill-list lb
(list "Set state" "COMPLETED" "NOT_STARTED" "RUNNING" "REMOTEHOSTSTART" "KILLED" "KILLREQ")
"Set state" ) ; (db:test-get-state testdat))
lb))
(iup:hbox ; #:expand "HORIZONTAL" ;; the status
(iup:label "STATUS:" ; #:size "30x" #:expand "HORIZONTAL"
)
(let ((lb (iup:listbox #:action (lambda (val a b c)
(set! newstatus a))
;; #:editbox "YES"
;; #:value currstatus
#:dropdown "YES"
;#:expand "HORIZONTAL"
)))
(iuplistbox-fill-list lb
(list "Set status" "PASS" "WARN" "FAIL" "CHECK" "n/a")
"Set status" ) ; (db:test-get-status testdat))
lb)))
(iup:vbox
(iup:button "Apply"
#:expand "YES"
#:action (lambda (x)
(db:test-set-state-status-by-id *db* test-id newstate newstatus newcomment)
))
(iup:hbox; #:expand "YES"
(iup:vbox
(iup:button "Apply and close"
; #:expand "YES"
#:action (lambda (x)
(db:test-set-state-status-by-id *db* test-id newstate newstatus newcomment)
(exit))))
(iup:vbox
(iup:button "Cancel and close"
; #:expand "YES"
#:action (lambda (x)
(exit)))))))
))))))
(iup:show self)
;; Now start keeping the gui updated from the db
(let loop ((i 0))
(thread-sleep! 0.1)
(refreshdat) ;; update from the db here
(thread-suspend! other-thread)
;(thread-suspend! other-thread)
;; update the gui elements here
(for-each
(lambda (key)
;; (print "Updating " key)
((hash-table-ref widgets key)))
(hash-table-keys widgets))
(thread-resume! other-thread)
(loop i))))))
;(thread-resume! other-thread)
; (iup:refresh self)
(iup:main-loop-flush)
(if *exit-started*
(set! *exit-started* 'ok)
(loop i)))))))
;;
;; (iup:frame (iup:label (conc "TESTNAME:\n" testfullname) #:expand "YES")))
;; (iup:frame #:title "Actions" #:expand "YES"
;; (iup:hbox ;; the actions box
;; (iup:button "View Log" #:action viewlog #:expand "YES")
;; (iup:button "Start Xterm" #:action xterm #:expand "YES")))
|
| ︙ | | |
Modified dashboard.scm
from [241b3a33a0]
to [9dc30172fd].
| ︙ | | |
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
+
|
(define *alltestnamelst* '())
(define *searchpatts* (make-hash-table))
(define *num-runs* 10)
(define *num-tests* 15)
(define *start-run-offset* 0)
(define *start-test-offset* 0)
(define *examine-test-dat* (make-hash-table))
(define *exit-started* #f)
(define (message-window msg)
(iup:show
(iup:dialog
(iup:vbox
(iup:label msg #:margin "40x40")))))
|
| ︙ | | |
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
|
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
|
+
+
-
+
|
(let* ((button-key (mkstr runnum testnum))
(butn (iup:button "" ;; button-key
#:size "60x15"
;; #:expand "HORIZONTAL"
#:fontsize "10"
#:action (lambda (x)
(let* ((toolpath (car (argv)))
(buttndat (hash-table-ref *buttondat* button-key))
(test-id (db:test-get-id (vector-ref buttndat 3)))
(cmd (conc toolpath " -test " testnum "&")))
(cmd (conc toolpath " -test " test-id "&")))
(print "Launching " cmd)
(system cmd))))))
(hash-table-set! *buttondat* button-key (vector 0 "100 100 100" button-key #f #f))
(vector-set! testvec testnum butn)
(loop runnum (+ testnum 1) testvec (cons butn res))))))
;; now assemble the hdrlst and bdylst and kick off the dialog
(iup:show
|
| ︙ | | |
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
|
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
|
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
|
(define *job* #f)
(cond
((args:get-arg "-run")
(let ((runid (string->number (args:get-arg "-run"))))
(if runid
(set! *job* (lambda (thr)(examine-run *db* runid)))
(set! *job* (lambda (mx1)
(on-exit (lambda ()
(sqlite3:finalize! *db*)))
(examine-run *db* runid)))
(begin
(print "ERROR: runid is not a number " (args:get-arg "-run"))
(exit 1)))))
((args:get-arg "-test")
(let ((testid (string->number (args:get-arg "-test"))))
(if testid
(set! *job* (lambda (thr)(examine-test *db* testid thr)))
(set! *job* (lambda (mx1)
; (on-exit (lambda ()
; ; ;;(iup:main-loop-flush)
; (set! *exit-started* #t)
; (let loop ((i 0))
; (if (and (< i 100)
; (not (eq? *exit-started* 'ok)))
; (begin
; (thread-sleep! 0.1)
; (loop (+ i 1)))))
; (sqlite3:finalize! *db*)
; (exit)))
(examine-test *db* testid mx1)))
(begin
(print "ERROR: testid is not a number " (args:get-arg "-test"))
(exit 1)))))
(else
(set! uidat (make-dashboard-buttons *num-runs* *num-tests* dbkeys))
(set! *job* (lambda (thr)(run-update thr)))))
(let* ((mx1 (make-mutex))
(let* ((th2 (make-thread iup:main-loop))
(th1 (make-thread (*job* th2))))
|
Modified db.scm
from [588f74bb33]
to [49e9eed590].
| ︙ | | |
227
228
229
230
231
232
233
234
235
236
237
238
239
240
|
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
|
+
+
+
+
+
|
(if currstatus (conc "status='" currstatus "' AND ") "")
" testname=? AND NOT (item_path='' AND testname in (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")))
;;(print "QRY: " qry)
(sqlite3:execute db qry newstate newstatus testname testname)))
testnames))
;; "('" (string-intersperse tests "','") "')")
(define (db:test-set-state-status-by-id db test-id newstate newstatus newcomment)
(if newstate (sqlite3:execute db "UPDATE tests SET state=? WHERE id=?;" newstate test-id))
(if newstatus (sqlite3:execute db "UPDATE tests SET status=? WHERE id=?;" newstatus test-id))
(if newcomment (sqlite3:execute db "UPDATE tests SET comment=? WHERE id=?;" newcomment test-id)))
(define (db:get-count-tests-running db)
(let ((res 0))
(sqlite3:for-each-row
(lambda (count)
(set! res count))
db
"SELECT count(id) FROM tests WHERE state = 'RUNNING' OR state = 'LAUNCHED' OR state = 'REMOTEHOSTSTART';")
|
| ︙ | | |