Testing - Retesting step for GH Actions #268

Adding new step to retest result per each job line.
Rework logic to minimize retesting.
Creating base for splitting into actions.
Adding new TCL command to clear up test folder from skipped

.github/actions/setup-xvfb-mesa/action.yml

@@ -0,0 +1,18 @@
+name: 'Setup Xvfb and Mesa'
+description: 'Installs and configures Xvfb and Mesa for graphical testing on Linux'
+
+runs:
+  using: composite
+  steps:
+    - name: Install Xvfb and Mesa
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y xvfb mesa-utils libgl1-mesa-dri
+      shell: bash
+
+    - name: Start Xvfb
+      run: |
+        Xvfb :99 -screen 0 1920x1080x24 &
+        echo "DISPLAY=:99" >> $GITHUB_ENV
+        echo "LIBGL_ALWAYS_SOFTWARE=1" >> $GITHUB_ENV
+      shell: bash

.github/actions/testgrid/testlinuxclang.tcl

@@ -0,0 +1,31 @@
+set exclude_list [list \
+    "bugs caf bug31075" \
+    "bugs caf bug31546" \
+    "bugs fclasses bug6143" \
+    "bugs fclasses bug25574" \
+    "bugs fclasses bug29064" \
+    "bugs fclasses bug7287_3" \
+    "bugs fclasses bug7287_5" \
+    "bugs moddata_2 bug712_2" \
+    "collections n arrayMove" \
+    "lowalgos intss bug565" \
+    "lowalgos intss bug567_1" \
+    "lowalgos intss bug23972" \
+    "lowalgos intss bug29910_2" \
+    "opengl background bug27836" \
+    "opengl text C4" \
+    "opengles3 background bug27836" \
+    "opengles3 general msaa" \
+    "opengles3 geom interior1" \
+    "opengles3 geom interior2" \
+    "opengles3 raytrace msaa" \
+    "opengles3 text C4" \
+    "opengles3 textures alpha_mask" \
+    "boolean bopfuse_simple ZP6" \
+    "boolean gdml_private B5" \
+    "bugs modalg_1 bug19071" \
+    "bugs modalg_5 bug25199"
+]
+
+set exclude_str [join $exclude_list ,]
+testgrid -exclude {*}$exclude_str -outdir results/linux-clang-x64

.github/actions/testgrid/testlinuxgcc.tcl

@@ -0,0 +1,27 @@
+set exclude_list [list \
+    "bugs caf bug31075" \
+    "bugs caf bug31546" \
+    "bugs fclasses bug6143" \
+    "bugs moddata_2 bug712_2" \
+    "bugs modalg_6 bug27884" \
+    "lowalgos intss bug565" \
+    "lowalgos intss bug567_1" \
+    "lowalgos intss bug23972" \
+    "lowalgos intss bug29910_2" \
+    "opengl background bug27836" \
+    "opengl text C4" \
+    "opengles3 background bug27836" \
+    "opengles3 general msaa" \
+    "opengles3 geom interior1" \
+    "opengles3 geom interior2" \
+    "opengles3 raytrace msaa" \
+    "opengles3 text C4" \
+    "opengles3 textures alpha_mask" \
+    "boolean bopfuse_simple ZP6" \
+    "boolean gdml_private B5" \
+    "bugs modalg_1 bug19071" \
+    "bugs modalg_5 bug25199"
+]
+
+set exclude_str [join $exclude_list ,]
+testgrid -exclude {*}$exclude_str -outdir results/linux-gcc-x64

.github/actions/testgrid/testmacos.tcl

@@ -0,0 +1 @@
+testgrid -outdir results/macos-x64 caf basic

.github/actions/testgrid/testmacosgcc.tcl

@@ -0,0 +1 @@
+testgrid -outdir results/macos-gcc-x64 caf basic

.github/actions/testgrid/testwindows.tcl

@@ -0,0 +1,24 @@
+set exclude_list [list \
+    "bugs fclasses bug6143" \
+    "bugs modalg_5 bug24639" \
+    "bugs modalg_7 bug83" \
+    "bugs caf bug31918_1" \
+    "chamfer dist_angle_sequence A5" \
+    "opengl background bug27836" \
+    "opengl drivers d3dhost" \
+    "opengl background srgb" \
+    "opengl text C4" \
+    "opengles2 text C4" \
+    "opengles3 text C4" \
+    "boolean gdml_private B5" \
+    "chamfer dist_angle A3" \
+    "chamfer dist_angle E5" \
+    "chamfer dist_angle_complex A1" \
+    "chamfer dist_angle_complex A4" \
+    "chamfer dist_angle_complex A5" \
+    "chamfer dist_angle_sequence A1" \
+    "chamfer dist_angle_sequence A4"
+]
+
+set exclude_str [join $exclude_list ,]
+testgrid -exclude {*}$exclude_str -outdir results/windows-x64

.github/actions/testgrid/testwindowsclang.tcl

@@ -0,0 +1,25 @@
+set exclude_list [list \
+    "bugs caf bug31918_1" \
+    "bugs fclasses bug6143" \
+    "bugs fclasses bug25574" \
+    "bugs fclasses bug29064" \
+    "chamfer dist_angle_sequence A5" \
+    "collections n arrayMove" \
+    "opengl background bug27836" \
+    "opengl drivers d3dhost" \
+    "opengl background srgb" \
+    "opengl text C4" \
+    "opengles2 text C4" \
+    "opengles3 text C4" \
+    "boolean gdml_private B5" \
+    "chamfer dist_angle A3" \
+    "chamfer dist_angle E5" \
+    "chamfer dist_angle_complex A1" \
+    "chamfer dist_angle_complex A4" \
+    "chamfer dist_angle_complex A5" \
+    "chamfer dist_angle_sequence A1" \
+    "chamfer dist_angle_sequence A4"
+]
+
+set exclude_str [join $exclude_list ,]
+testgrid -exclude {*}$exclude_str -outdir results/windows-clang-x64

src/DrawResources/TestCommands.tcl

@@ -537,7 +537,21 @@ proc testgrid {args} {
                         if { $nbskip > 0 } {
                             incr nbskip -1
                         } else {
-                            lappend tests_list [list $dir $group $grid $casename $casefile]
+                            # Check if current test matches exclude pattern
+                            set should_exclude 0
+                            if { ${exc_case} > 0 } {
+                              foreach excl $exclude_case {
+                                  if {[string match "$group" [lindex $excl 0]] && 
+                                      [string match "$grid" [lindex $excl 1]] && 
+                                      [string match "$casename" [lindex $excl 2]]} {
+                                      set should_exclude 1
+                                      break
+                                  }
+                              }
+                            }
+                            if {!$should_exclude} {
+                                lappend tests_list [list $dir $group $grid $casename $casefile]
+                            }
                         }
                     }
                 }
@@ -549,7 +563,6 @@ proc testgrid {args} {
     } else {
         puts "Running tests (total [llength $tests_list] test cases)..."
     }
-
     ######################################################
     # run tests
     ######################################################
@@ -2904,3 +2917,53 @@ proc checktrend {listval delta tolerance message} {
     # check if deviation is clearly within a range
     return [expr abs ($mean - $delta) <= $sigma && $sigma <= $tolerance]
 }
+
+# Procedure to clean up test results by removing skipped test directories
+help cleanuptest {
+  Clean up test results by removing skipped test case directories and non-essential files.
+  Use: cleanuptest results_dir
+  Where results_dir is the directory containing test results including tests.log
+}
+proc cleanuptest {results_dir} {
+    # Function to extract test case path from test case name
+    proc get_test_path {test_case} {
+        # Extract directory parts from test case string
+        # Format: "CASE group grid case: status"
+        if { [regexp {^CASE ([^ ]+) (.*[^ ]) ([^ ]+):} $test_case -> group grid case] } {
+            # Remove any extra spaces from grid
+            set grid [string trim $grid]
+            return [file join $group $grid $case]
+        }
+        puts "Error: Cannot parse test case: $test_case"
+        return ""
+    }
+
+    set log_file [file join $results_dir "tests.log"]
+    if { ! [file exists $log_file] } {
+        puts "Error: No tests.log found in $results_dir"
+        return
+    }
+
+    # Process tests.log and find skipped tests
+    set fd [open $log_file r]
+    while {[gets $fd line] >= 0} {
+        if {[regexp {^CASE.*: SKIPPED \(data file is missing\)$} $line]} {
+            set test_path [get_test_path $line]
+            if { $test_path != "" } {
+                set full_path [file join $results_dir $test_path]
+                # Delete any files with this base path (any extension)
+                set files_to_delete [glob -nocomplain "${full_path}*"]
+                foreach file $files_to_delete {
+                    if {[file exists $file]} {
+                        file delete -force $file
+                    }
+                }
+                # Delete directory if it exists
+                if {[file isdirectory $full_path]} {
+                    file delete -force $full_path
+                }
+            }
+        }
+    }
+    close $fd
+}