OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0029050: SKIPPED test cases are no listed in header of summary.html

Browse Source 
Adding list of SKIPPED test cases in header of summary.html under header Skipped:, and in the end of text log file
This commit is contained in:
bugmaster 2017-09-06 16:24:25 +03:00
parent 30017a480e
commit 4514dc74e4
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/DrawResources/TestCommands.tcl
View File

@ -1517,7 +1517,7 @@ proc _html_highlight {status line} {
# Internal procedure to generate HTML page presenting log of the tests # Internal procedure to generate HTML page presenting log of the tests
# execution in tabular form, with links to reports on individual cases # execution in tabular form, with links to reports on individual cases
proc _log_html_summary {logdir log totals regressions improvements total_time} { proc _log_html_summary {logdir log totals regressions improvements skipped total_time} {
global _test_case_regexp global _test_case_regexp
# create missing directories as needed # create missing directories as needed
@ -1564,7 +1564,7 @@ proc _log_html_summary {logdir log totals regressions improvements total_time} {
} }
# print regressions and improvements # print regressions and improvements
foreach featured [list $regressions $improvements] { foreach featured [list $regressions $improvements $skipped] {
if { [llength $featured] <= 1 } { continue } if { [llength $featured] <= 1 } { continue }
set status [string trim [lindex $featured 0] { :}] set status [string trim [lindex $featured 0] { :}]
puts $fd "<h2>$status</h2>" puts $fd "<h2>$status</h2>"
@ -1671,13 +1671,16 @@ proc _log_summarize {logdir log {total_time {}}} {
set totals {} set totals {}
set improvements {Improvements:} set improvements {Improvements:}
set regressions {Failed:} set regressions {Failed:}
set skipped {Skipped:}
if { [info exists stat] } { if { [info exists stat] } {
foreach status [lsort [array names stat]] { foreach status [lsort [array names stat]] {
lappend totals [list [llength $stat($status)] $status] lappend totals [list [llength $stat($status)] $status]
# separately count improvements (status starting with IMP) and regressions (all except IMP, OK, BAD, and SKIP) # separately count improvements (status starting with IMP), skipped (status starting with SKIP) and regressions (all except IMP, OK, BAD, and SKIP)
if { [regexp -nocase {^IMP} $status] } { if { [regexp -nocase {^IMP} $status] } {
eval lappend improvements $stat($status) eval lappend improvements $stat($status)
} elseif { [regexp -nocase {^SKIP} $status] } {
eval lappend skipped $stat($status)
} elseif { $status != "OK" && ! [regexp -nocase {^BAD} $status] && ! [regexp -nocase {^SKIP} $status] } { } elseif { $status != "OK" && ! [regexp -nocase {^BAD} $status] && ! [regexp -nocase {^SKIP} $status] } {
eval lappend regressions $stat($status) eval lappend regressions $stat($status)
} }
@ -1692,6 +1695,9 @@ proc _log_summarize {logdir log {total_time {}}} {
if { [llength $regressions] > 1 } { if { [llength $regressions] > 1 } {
_log_and_puts log [join $regressions "\n "] _log_and_puts log [join $regressions "\n "]
} }
if { [llength $skipped] > 1 } {
_log_and_puts log [join $skipped "\n "]
}
if { [llength $improvements] == 1 && [llength $regressions] == 1 } { if { [llength $improvements] == 1 && [llength $regressions] == 1 } {
_log_and_puts log "No regressions" _log_and_puts log "No regressions"
} }
@ -1701,7 +1707,7 @@ proc _log_summarize {logdir log {total_time {}}} {
# save log to files # save log to files
if { $logdir != "" } { if { $logdir != "" } {
_log_html_summary $logdir $log $totals $regressions $improvements $total_time _log_html_summary $logdir $log $totals $regressions $improvements $skipped $total_time
_log_save $logdir/tests.log [join $log "\n"] "Tests summary" _log_save $logdir/tests.log [join $log "\n"] "Tests summary"
} }