}
wapp-page-tests
set script "script/$G(state).js"
wapp-trim {
@@ -360,11 +417,11 @@
generate_main_page
}
proc wapp-page-tests {} {
global G
- wapp-trim {
}
+ wapp-trim { }
foreach t $G(test_array) {
set config [dict get $t config]
set target [dict get $t target]
set class "testwait"
@@ -389,14 +446,14 @@
set seconds "$hr:$min:$sec"
}
wapp-trim {
- %html($config)
- | %html($target)
- | %html($seconds)
- |
+ | %html($config)
+ | %html($target)
+ | %html($seconds)
+ |
}
if {[info exists G(test.$config.log)]} {
set log $G(test.$config.log)
set uri "log/$log"
wapp-trim {
@@ -405,12 +462,11 @@
}
if {[info exists G(test.$config.errmsg)] && $G(test.$config.errmsg)!=""} {
set errmsg $G(test.$config.errmsg)
wapp-trim {
|
-
- | %html($errmsg)
+ | | %html($errmsg)
}
}
}
wapp-trim { |
}
@@ -428,15 +484,15 @@
# Whenever the form at the top of the application page is submitted, it
# is submitted here.
#
proc wapp-page-control {} {
global G
- catch { puts [wapp-param control_msvc] }
if {$::G(state)=="config"} {
- set lControls [list platform test tcl jobs keep msvc]
+ set lControls [list platform test tcl jobs keep msvc debug]
set G(msvc) 0
set G(keep) 0
+ set G(debug) 0
} else {
set lControls [list jobs]
}
foreach v $lControls {
if {[wapp-param-exists control_$v]} {
@@ -480,52 +536,37 @@
#
# Return the stylesheet for the application main page.
#
proc wapp-page-style.css {} {
wapp-subst {
- .div {
- border: 3px groove #444444;
- margin: 1em;
- padding: 1em;
- }
+ /* The boxes with black borders use this class */
.border {
border: 3px groove #444444;
padding: 1em;
margin-top: 1em;
margin-bottom: 1em;
}
- .div2 {
- margin: 1em;
- }
-
- table {
- padding: 1em;
- width:100%;
- border: 3px groove #444444;
- }
-
+ /* Float to the right (used for the Run/Stop/Reset button) */
+ .right { float: right; }
+
+ /* Style for the large red warning at the top of the page */
.warning {
- text-align:center;
color: red;
- font-size: 2em;
font-weight: bold;
}
- .testfield {
- padding-right: 10ex;
- white-space: nowrap;
- }
-
- .testwait {}
- .testrunning { color: blue }
- .testdone { color: green }
- .testfail { color: red }
-
- .right { float: right; }
-
+ /* Styles used by cells in the test table */
+ .padleft { padding-left: 5ex; }
+ .nowrap { white-space: nowrap; }
+
+ /* Styles for individual tests, depending on the outcome */
+ .testwait { }
+ .testrunning { color: blue }
+ .testdone { color: green }
+ .testfail { color: red }
}
}
# URI: /script/${state}.js
#
@@ -538,14 +579,15 @@
regexp {[^/]*$} [wapp-param REQUEST_URI] script
set tcl $::G(tcl)
set keep $::G(keep)
set msvc $::G(msvc)
+ set debug $::G(debug)
wapp-subst {
var lElem = \["control_platform", "control_test", "control_msvc",
- "control_jobs"
+ "control_jobs", "control_debug"
\];
lElem.forEach(function(e) {
var elem = document.getElementById(e);
elem.addEventListener("change", function() { control.submit() } );
})
@@ -556,10 +598,13 @@
elem = document.getElementById("control_keep");
elem.checked = %string($keep);
elem = document.getElementById("control_msvc");
elem.checked = %string($msvc);
+
+ elem = document.getElementById("control_debug");
+ elem.checked = %string($debug);
}
if {$script != "config.js"} {
wapp-subst {
var lElem = \["control_platform", "control_test",