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

0025067: Change default location of test results

Browse Source 
Generation of default path for test results corrected to have "results" as subdirectory and not prefix.

Parsing images in test results restricted to take only files with name of the test case without suffix or with suffix separated by underscore or dash, to avoid fetching images from different test case if its name starts like current test case.
This commit is contained in:
abv 2014-07-10 11:40:05 +04:00 committed by bugmaster
parent 2961777a50
commit ffc26091ca
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/DrawResources/TestCommands.tcl
View File

@ -162,13 +162,13 @@ proc testgrid {args} {
set logdir [file normalize [string trim $logdir]]
if { $logdir == "" } {
# if specified logdir is empty string, generate unique name like
# results_<branch>_<timestamp>
set prefix "results"
# results/<branch>_<timestamp>
set prefix ""
if { ! [catch {exec git branch} gitout] &&
[regexp {[*] ([\w]+)} $gitout res branch] } {
set prefix "${prefix}_$branch"
set prefix "${branch}_"
}
set logdir "${prefix}_[clock format [clock seconds] -format {%Y-%m-%dT%H%M}]"
set logdir "results/${prefix}[clock format [clock seconds] -format {%Y-%m-%dT%H%M}]"
set logdir [file normalize $logdir]
}
if { [file isdirectory $logdir] && ! $overwrite && ! [catch {glob -directory $logdir *}] } {
@ -1203,9 +1203,14 @@ proc _log_html {file log {title {}}} {
# print header
puts $fd "<html><head><title>$title</title></head><body><h1>$title</h1>"
# add images if present
# add images if present; these should have either PNG, GIF, or JPG extension,
# and start with name of the test script, with optional suffix separated
# by underscore or dash
set imgbasename [file rootname [file tail $file]]
foreach img [lsort [glob -nocomplain -directory [file dirname $file] -tails ${imgbasename}*.gif ${imgbasename}*.png ${imgbasename}*.jpg]] {
foreach img [lsort [glob -nocomplain -directory [file dirname $file] -tails \
${imgbasename}.gif ${imgbasename}.png ${imgbasename}.jpg \
${imgbasename}_*.gif ${imgbasename}_*.png ${imgbasename}_*.jpg \
${imgbasename}-*.gif ${imgbasename}-*.png ${imgbasename}-*.jpg]] {
puts $fd "<p>[file tail $img]<br><img src=\"$img\"/><p>"
}