]> OCCT Git - occt-copy.git/commitdiff
projects / occt-copy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2961777)
0025067: Change default location of test results
authorabv <abv@opencascade.com>
Thu, 10 Jul 2014 07:40:05 +0000 (11:40 +0400)
committerbugmaster <bugmaster@opencascade.com>
Thu, 31 Jul 2014 10:44:32 +0000 (14:44 +0400)
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.

src/DrawResources/TestCommands.tcl patch | blob | blame | history

diff --git a/src/DrawResources/TestCommands.tcl b/src/DrawResources/TestCommands.tcl
index b1efc696a0d9e427f92ba15c35caa39a413d36f2..5fe1c0acc0ac6bb28e05958f78775ee50d082804 100644 (file)
--- a/src/DrawResources/TestCommands.tcl
+++ b/src/DrawResources/TestCommands.tcl
@@ -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>"
     }
 
Test copy of Open CASCADE Technology repository