0033548: Tests - VC142 internal problem for Chamfer functionality

Update test cases for Jenkins old compiler. Mark as BAD

diff --git a/tests/bugs/modalg_1/bug116 b/tests/bugs/modalg_1/bug116
index 3d38481580eff789d3280764b4004bf978a66b67..a7ea19d7b0439e233c4608a48fcac5ab1182dc67 100755 (executable)
--- a/tests/bugs/modalg_1/bug116
+++ b/tests/bugs/modalg_1/bug116
@@ -1,3 +1,4 @@
+puts "TODO OCC33548 Windows: compute of chamfer failed"
 
 puts "================"
 puts "OCC116"
@@ -14,12 +15,8 @@ explode sh f
 explode sh_6 e
 
 if [catch {chamf result sh sh_6_1 sh_6 A 2 45 sh_6_8 sh_6 A 2 45 } catch_result] {
-  puts "1) Faulty  OCC116: chamfer is NOT created properly"
  } else {
-  puts "1) CHAMF OCC116 OK"
+  checkprops result -s 48357.5 
+  checkshape result
+  checkview -display result -2d -path ${imagedir}/${test_image}.png
 }
-
-checkprops result -s 48357.5 
-checkshape result
-checkview -display result -2d -path ${imagedir}/${test_image}.png
-

diff --git a/tests/bugs/modalg_2/bug293 b/tests/bugs/modalg_2/bug293
index 07744e7d37507914a8902d623af79efe48baa7cd..0298df8fed75f7abc81cc829fbef08acfd0b028a 100755 (executable)
--- a/tests/bugs/modalg_2/bug293
+++ b/tests/bugs/modalg_2/bug293
@@ -1,3 +1,6 @@
+puts "TODO OCC33548 Windows: compute of chamfer failed"
+puts "TODO OCC33548 Windows: TEST INCOMPLETE"
+
 puts "================"
 puts "OCC293"
 puts "================"

diff --git a/tests/bugs/moddata_2/bug266 b/tests/bugs/moddata_2/bug266
index e9d8377e98107f8a21661cbdf046ed9ed6410bd3..8ece46b44668f3e50e39159ae11ad8289dd4595b 100755 (executable)
--- a/tests/bugs/moddata_2/bug266
+++ b/tests/bugs/moddata_2/bug266
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: Tcl Exception: compute of chamfer failed"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+puts "TODO OCC24156 MacOS: compute of chamfer failed"
+puts "TODO OCC33548 Windows: compute of chamfer failed"
 
 puts "================"
 puts "OCC266"
@@ -15,9 +15,9 @@ explode edge e
 renamevar edge face
 explode face f
 
-chamf result face edge_10 face_3 A 1 45 edge_6 face_3 A 1 45 edge_11 face_3 A 1 45 edge_12 face_3 A 1 45 edge_13 face_3 A 1 45 edge_14 face_3 A 1 45 edge_8 face_3 A 1 45 edge_9 face_3 A 1 45
-checkshape result
-
-checkprops result -s 48913
-checkview -display result -2d -path ${imagedir}/${test_image}.png
-
+if [catch {chamf result face edge_10 face_3 A 1 45 edge_6 face_3 A 1 45 edge_11 face_3 A 1 45 edge_12 face_3 A 1 45 edge_13 face_3 A 1 45 edge_14 face_3 A 1 45 edge_8 face_3 A 1 45 edge_9 face_3 A 1 45 } catch_result] {
+} else {
+  checkshape result
+  checkprops result -s 48913
+  checkview -display result -2d -path ${imagedir}/${test_image}.png
+}

diff --git a/tests/chamfer/data/complex/A5 b/tests/chamfer/data/complex/A5
index 9da88b0f16aafaf91cc66bf9af5d0a22313629da..ea74677898b86a045c02baeb0ff3b89506b63324 100644 (file)
--- a/tests/chamfer/data/complex/A5
+++ b/tests/chamfer/data/complex/A5
@@ -6,7 +6,7 @@ set chamf_equal_dist [list "0.03     " "0.05     " "0.05     " "0.03     " "0.05
 if { [string compare $command chamf_sequence] == 0 } {
   if {[string compare $group dist_angle] == 0} {
     puts "TODO OCC22909 All: compute of chamfer failed"
-    puts "TODO OCC22909 All:Faulty shapes in variables faulty_1 to faulty_6"
+    puts "TODO OCC22909 Linux:Faulty shapes in variables faulty_1 to faulty_6"
   }
   if {[string compare $group dist_dist] == 0} {
     puts "TODO OCC22909 All: compute of chamfer failed"

diff --git a/tests/chamfer/end b/tests/chamfer/end
index 31a1d89915b10d0ce3d48194ddf66391b3650d1a..89d6246626f554287c91a00e1a329ce0a05f7b9b 100644 (file)
--- a/tests/chamfer/end
+++ b/tests/chamfer/end
@@ -1,3 +1,24 @@
+set shouldFailed 0
+
+if { $group eq "dist_angle" && $command eq "chamf" } {
+  if { ($test_image eq "A3" && $chamf_shape eq "test-fillet.brep") ||
+       ($test_image eq "E5" && $chamf_shape eq "CCH_testchet.rle") ||
+       ($test_image eq "A1" && $chamf_shape eq "CCH_001_ahdb.rle") ||
+       ($test_image eq "A4" && $chamf_shape eq "test-fillet.brep") ||
+       ($test_image eq "A5" && $chamf_shape eq "test-fillet.brep") } {
+    set shouldFailed 1
+  }
+} elseif { $group eq "dist_angle" && $command eq "chamf_sequence" } {
+  if { ($test_image eq "A1" && $chamf_shape eq "CCH_001_ahdb.rle") ||
+       ($test_image eq "A4" && $chamf_shape eq "test-fillet.brep") } {
+    set shouldFailed 1
+  }
+}
+
+if {$shouldFailed} {
+  puts "TODO OCC33548 Windows: compute of chamfer failed"
+}
+
 restore [locate_data_file $chamf_shape] sh
 if { [dval SCALE] != 0 } {
    tscale sh 0 0 0 SCALE