0032451: Tests - adjusting test cases with Improvement status on macOS arm64 platforms

- Load OPENGL draw plugin before using vcaps
- Skip optional VTK plugin on macOS within "oit" test
- Processing improvements

diff --git a/tests/bugs/filling/bug22783 b/tests/bugs/filling/bug22783
index fdb5cd4542a271f354404ae8b682821e81587747..2454b9e4cf641b0a7a954c41b45eab28f5db9fe4 100644 (file)
--- a/tests/bugs/filling/bug22783
+++ b/tests/bugs/filling/bug22783
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "==========="
 puts "0022783: Improvement of BRepOffsetAPI_MakeFilling: keep old and new boundary edges with all pcurves"
 puts "==========="

diff --git a/tests/bugs/filling/bug22786 b/tests/bugs/filling/bug22786
index af33d025d3a7bcfaaa47f925e904e93613c901fa..604d0ddbfc212635af61e540f9d61d987f66473a 100644 (file)
--- a/tests/bugs/filling/bug22786
+++ b/tests/bugs/filling/bug22786
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "============"
 puts "0022786: 64bit issue in AdvApp2Var"
 puts "============"

diff --git a/tests/bugs/modalg_2/bug23367_2 b/tests/bugs/modalg_2/bug23367_2
index dc77f81e16a84d9f62d3201df4d42dd96cac0c21..2acf74f69053c97a4e9fbdc60aa094ef53b2ac01 100755 (executable)
--- a/tests/bugs/modalg_2/bug23367_2
+++ b/tests/bugs/modalg_2/bug23367_2
@@ -2,7 +2,6 @@ puts "============"
 puts "CR23367"
 puts "============"
 puts ""
-puts "TODO OCC24156 MacOS: Error : The length of result shape is"
 ##########################################################################################################
 # New functionality restoring the middle path of pipe-like shape
 ##########################################################################################################

diff --git a/tests/bugs/modalg_2/bug426 b/tests/bugs/modalg_2/bug426
index 3828591fe60bf16947287bfff7767b79e3897c4a..39f36fa8b07a2e59409d86535557044e721ab863 100755 (executable)
--- a/tests/bugs/modalg_2/bug426
+++ b/tests/bugs/modalg_2/bug426
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 pload QAcommands
 
 puts "========"

diff --git a/tests/bugs/modalg_2/bug474 b/tests/bugs/modalg_2/bug474
index 3e90042ef8481a9022f91a299a9901394b182a3b..0acd67b2f0696504b8f75cc3d64c9f804016920a 100755 (executable)
--- a/tests/bugs/modalg_2/bug474
+++ b/tests/bugs/modalg_2/bug474
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: Tcl Exception"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "========================"
 puts " OCC474 "
 puts "========================"

diff --git a/tests/bugs/modalg_2/bug487 b/tests/bugs/modalg_2/bug487
index 823159c61f21f16c2d40adf7f9d1abaed6713bb2..e067a0cd6be03744e54f86232c976bfc63c1dbe8 100755 (executable)
--- a/tests/bugs/modalg_2/bug487
+++ b/tests/bugs/modalg_2/bug487
@@ -1,7 +1,3 @@
-puts "TODO OCC24156 MacOS: Faulty OCC485: function BLEND works wrongly"
-puts "TODO OCC24156 MacOS: Tcl Exception: result is not a topological shape!!!"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "========================"
 puts " OCC487 "
 puts "========================"

diff --git a/tests/bugs/modalg_4/bug625 b/tests/bugs/modalg_4/bug625
index d40baec41abcd11b02166c44b94b20156c95ca2c..b5a64577d954373066bfc2e5af521541bd06cc6b 100755 (executable)
--- a/tests/bugs/modalg_4/bug625
+++ b/tests/bugs/modalg_4/bug625
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: Tcl Exception: tolerance ang"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "========================"
 puts "OCC625"
 puts "========================"

diff --git a/tests/bugs/modalg_4/bug8842_11 b/tests/bugs/modalg_4/bug8842_11
index 55fb7187b55ce920ad3c8b19d4502e2829302d96..161e9a7c3095c3c2c87b980cf1724529ea3cd43f 100755 (executable)
--- a/tests/bugs/modalg_4/bug8842_11
+++ b/tests/bugs/modalg_4/bug8842_11
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: OCC8842: Faulty"
-
 puts "============"
 puts "00008842: E r r o r s in Offset Shape algorithm working with bspline and surface of revolution"
 puts "============"

diff --git a/tests/bugs/modalg_4/bug8842_12 b/tests/bugs/modalg_4/bug8842_12
index 0852f3afe424739a03b0cb5daf5ef2a644a8ec16..74d3d1077ea460881646c80f35d5d27b4ba38ab6 100755 (executable)
--- a/tests/bugs/modalg_4/bug8842_12
+++ b/tests/bugs/modalg_4/bug8842_12
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: OCC8842: Faulty"
-
 puts "============"
 puts "00008842: E r r o r s in Offset Shape algorithm working with bspline and surface of revolution"
 puts "============"

diff --git a/tests/bugs/modalg_4/bug8842_3 b/tests/bugs/modalg_4/bug8842_3
index b21c170049e0ee22091503adff1898b21dae8ad9..83ce6414b9bd1c49d15b8454d183becb420bd157 100755 (executable)
--- a/tests/bugs/modalg_4/bug8842_3
+++ b/tests/bugs/modalg_4/bug8842_3
@@ -1,7 +1,5 @@
 puts "TODO OCC25913 ALL: Error :  is WRONG because number of"
 puts "TODO OCC25913 ALL: Error : The area of result shape is"
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: OCC8842: Faulty"
 
 puts "============"
 puts "00008842: E r r o r s in Offset Shape algorithm working with bspline and surface of revolution"

diff --git a/tests/bugs/modalg_5/bug23870_1 b/tests/bugs/modalg_5/bug23870_1
index de363679f7fd4064059922bd1a7ca60de7c481f6..1d4e1caf7270d6de0e19fc4fb8c3bb0ebb3b986c 100755 (executable)
--- a/tests/bugs/modalg_5/bug23870_1
+++ b/tests/bugs/modalg_5/bug23870_1
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "============"
 puts "0023870: Integration of new options of sweeping into BRepOffsetAPI_MakePipe algorithm"
 puts "============"

diff --git a/tests/bugs/modalg_5/bug23870_2 b/tests/bugs/modalg_5/bug23870_2
index aedc90ba137a7f5d8e9b171bbb3f73a756e467e0..9518bdc315d606ba68b2cbe996d6f2aacba49e26 100755 (executable)
--- a/tests/bugs/modalg_5/bug23870_2
+++ b/tests/bugs/modalg_5/bug23870_2
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "============"
 puts "0023870: Integration of new options of sweeping into BRepOffsetAPI_MakePipe algorithm"
 puts "============"

diff --git a/tests/bugs/modalg_5/bug23870_4 b/tests/bugs/modalg_5/bug23870_4
index 84e6107b5bedb38ce3590e460364a9777762a146..02e43da7008d8d5d690c8603366e89d364fa7c72 100755 (executable)
--- a/tests/bugs/modalg_5/bug23870_4
+++ b/tests/bugs/modalg_5/bug23870_4
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "============"
 puts "0023870: Integration of new options of sweeping into BRepOffsetAPI_MakePipe algorithm"
 puts "============"

diff --git a/tests/bugs/moddata_2/bug266 b/tests/bugs/moddata_2/bug266
index e9d8377e98107f8a21661cbdf046ed9ed6410bd3..2214499be110568af6aee6d39edd95b7ef3125df 100755 (executable)
--- a/tests/bugs/moddata_2/bug266
+++ b/tests/bugs/moddata_2/bug266
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: Tcl Exception: compute of chamfer failed"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "================"
 puts "OCC266"
 puts "================"

diff --git a/tests/bugs/step/buc60948 b/tests/bugs/step/buc60948
index 0535aa38530538bc1ed6f036f6b604173007cc64..7cfa70fb4ec0a0bab142d0d04cc20689b9052f53 100755 (executable)
--- a/tests/bugs/step/buc60948
+++ b/tests/bugs/step/buc60948
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: \\*\\*\\* Abort"
-puts "TODO OCC24156 MacOS: ... The exception is"
-
 puts "========================"
 puts "BUC60948"
 puts "========================"

diff --git a/tests/bugs/xde/bug26174 b/tests/bugs/xde/bug26174
index 006fe976e5cf863e039d556588fab2f9a4ddd64a..7360bab41fa43b712d812e726fe991245ff597d5 100644 (file)
--- a/tests/bugs/xde/bug26174
+++ b/tests/bugs/xde/bug26174
@@ -1,5 +1,5 @@
-puts "TODO OCC26174 ALL: ERROR: OCC26174 is reproduced."
-
+puts "TODO OCC26174 Windows: ERROR: OCC26174 is reproduced."
+puts "TODO OCC26174 Linux: ERROR: OCC26174 is reproduced."
 puts "========"
 puts "OCC26174"
 puts "========"

diff --git a/tests/chamfer/data/complex/B4 b/tests/chamfer/data/complex/B4
index de7ed67d6924049ef2f9983b01286797641ac373..351e24f2a8a1df70fd993cfc1f0ecd826bd350c7 100644 (file)
--- a/tests/chamfer/data/complex/B4
+++ b/tests/chamfer/data/complex/B4
@@ -5,5 +5,5 @@ set chamf_dist_dist  [list "0.05 0.05" "0.05 0.09" "0.1 0.08"]
 set chamf_equal_dist [list "0.05     " "0.05     " "0.2     "]
 if { [string compare $command chamf_sequence] == 0 && [string compare $group equal_dist] == 0 } {
   puts "TODO OCC22909 ALL:Faulty shapes in variables faulty_1 to faulty_"
-  puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
+#  puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
 }

diff --git a/tests/chamfer/data/complex/B5 b/tests/chamfer/data/complex/B5
index ee6673fdf06bedd2a48b23d4686cf5e87403dc93..0ad31001d217b9978234c3454e9158438eed7a20 100644 (file)
--- a/tests/chamfer/data/complex/B5
+++ b/tests/chamfer/data/complex/B5
@@ -8,14 +8,14 @@ if { [string compare $command chamf] == 0 } {
     puts "TODO OCC22909 All: compute of chamfer failed"
   }
 } else {
-  if {[string compare $group dist_angle] == 0} {
-    puts "TODO OCC22909 MacOS: compute of chamfer failed"
-  }
-  if {[string compare $group dist_dist] == 0} {
-    puts "TODO OCC22909 MacOS: compute of chamfer failed"
-  }
+#  if {[string compare $group dist_angle] == 0} {
+#    puts "TODO OCC22909 MacOS: compute of chamfer failed"
+#  }
+#  if {[string compare $group dist_dist] == 0} {
+#    puts "TODO OCC22909 MacOS: compute of chamfer failed"
+#  }
   if {[string compare $group equal_dist] == 0} {
     puts "TODO OCC22909 ALL:Faulty shapes in variables faulty_1 to faulty_"
-    puts "TODO OCC22909 MacOS: compute of chamfer failed"
+#    puts "TODO OCC22909 MacOS: compute of chamfer failed"
   }
 }

diff --git a/tests/chamfer/data/complex/B6 b/tests/chamfer/data/complex/B6
index 899c64cfaf8266da627e5fe6ceff1dfd02bf9b63..599735147a06b80c7d3b3b2db7c86c5da29b2202 100644 (file)
--- a/tests/chamfer/data/complex/B6
+++ b/tests/chamfer/data/complex/B6
@@ -10,12 +10,12 @@ if { [string compare $command chamf] == 0 } {
 } else {
   if {[string compare $group dist_angle] == 0} {
     puts "TODO OCC22909 All:Faulty shapes in variables faulty_1 to faulty_"
-    puts "TODO OCC24156 MacOS: compute of chamfer failed"
-  }
-  if {[string compare $group dist_dist] == 0} {
-    puts "TODO OCC24156 MacOS: compute of chamfer failed"
-  }
-  if {[string compare $group equal_dist] == 0} {
-    puts "TODO OCC24156 MacOS: compute of chamfer failed"
+#    puts "TODO OCC24156 MacOS: compute of chamfer failed"
   }
+#  if {[string compare $group dist_dist] == 0} {
+#    puts "TODO OCC24156 MacOS: compute of chamfer failed"
+#  }
+#  if {[string compare $group equal_dist] == 0} {
+#    puts "TODO OCC24156 MacOS: compute of chamfer failed"
+#  }
 }

diff --git a/tests/chamfer/data/complex/B7 b/tests/chamfer/data/complex/B7
index fccf6ee37da4993dd82d2cc6de553b333855572c..9a36d86cd7f6a611c160b1561223bcd392739a50 100644 (file)
--- a/tests/chamfer/data/complex/B7
+++ b/tests/chamfer/data/complex/B7
@@ -5,16 +5,11 @@ set chamf_dist_dist  [list "0.1 0.11" " 0.2 0.21"]
 set chamf_equal_dist [list "0.1     " " 0.2     "]
 if { [string compare $command chamf] == 0 } {
   puts "TODO OCC22909 All: compute of chamfer failed"
-} else {
-  if {[string compare $group dist_angle] == 0} {
-    puts "TODO OCC22909 MacOS: compute of chamfer failed"
   } else {
-    puts "TODO OCC22909 ALL:Faulty shapes in variables faulty_1 to faulty_"
-  }
   if {[string compare $group dist_dist] == 0} {
-    puts "TODO OCC22909 MacOS: compute of chamfer failed"
+    puts "TODO OCC22909 ALL:Faulty shapes in variables faulty_1 to faulty_"
   }
   if {[string compare $group equal_dist] == 0} {
-    puts "TODO OCC22909 MacOS: compute of chamfer failed"
+    puts "TODO OCC22909 ALL:Faulty shapes in variables faulty_1 to faulty_"
   }
 }

diff --git a/tests/chamfer/data/complex/B9 b/tests/chamfer/data/complex/B9
index b1b295ff8655a3c4fcb57af468158d09b106c8dc..3877995cd38b1a9b0d470b7eb6f48f48dd5efe01 100644 (file)
--- a/tests/chamfer/data/complex/B9
+++ b/tests/chamfer/data/complex/B9
@@ -25,16 +25,16 @@ if { [string compare $command chamf_sequence] == 0 } {
 
   if { [checkplatform -osx] } {
     if { [string compare $group dist_dist] == 0 } {
-      puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
+  #    puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
       set nf 8
     }
     if { [string compare $group equal_dist] == 0 } {
-      puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
+  #    puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
       set nf 2
     }
-    if { [string compare $group dist_angle] == 0 } {
-      puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
-    }
+ #   if { [string compare $group dist_angle] == 0 } {
+ #     puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed"
+ #   }
   }  
 
   if { $nf != 0 } {

diff --git a/tests/de_mesh/gltf_read/begin b/tests/de_mesh/gltf_read/begin
index 41994beb7687c6b92be7adb5a65a5ed47e708f65..6ce71f621100d0c92b722534b2e9dacbe74fc4d6 100644 (file)
--- a/tests/de_mesh/gltf_read/begin
+++ b/tests/de_mesh/gltf_read/begin
@@ -1,4 +1,4 @@
 pload XDE OCAF MODELING VISUALIZATION
 Close D -silent
 # PBR requires OpenGL 3.0+ on macOS
-if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+if { $::tcl_platform(os) == "Darwin" } { vdriver -load OPENGL; vcaps -core }

diff --git a/tests/de_mesh/gltf_write/begin b/tests/de_mesh/gltf_write/begin
index 41994beb7687c6b92be7adb5a65a5ed47e708f65..6ce71f621100d0c92b722534b2e9dacbe74fc4d6 100644 (file)
--- a/tests/de_mesh/gltf_write/begin
+++ b/tests/de_mesh/gltf_write/begin
@@ -1,4 +1,4 @@
 pload XDE OCAF MODELING VISUALIZATION
 Close D -silent
 # PBR requires OpenGL 3.0+ on macOS
-if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+if { $::tcl_platform(os) == "Darwin" } { vdriver -load OPENGL; vcaps -core }

diff --git a/tests/de_mesh/obj_read/begin b/tests/de_mesh/obj_read/begin
index 41994beb7687c6b92be7adb5a65a5ed47e708f65..6ce71f621100d0c92b722534b2e9dacbe74fc4d6 100644 (file)
--- a/tests/de_mesh/obj_read/begin
+++ b/tests/de_mesh/obj_read/begin
@@ -1,4 +1,4 @@
 pload XDE OCAF MODELING VISUALIZATION
 Close D -silent
 # PBR requires OpenGL 3.0+ on macOS
-if { $::tcl_platform(os) == "Darwin" } { vcaps -core }
+if { $::tcl_platform(os) == "Darwin" } { vdriver -load OPENGL; vcaps -core }

diff --git a/tests/heal/fix_face_size/B4 b/tests/heal/fix_face_size/B4
index b0915f6cd7e3ce4099e5923845f16a8cbfe67fe7..f5c9aede6e0b56d9fc5392fb329bed8802fa9551 100644 (file)
--- a/tests/heal/fix_face_size/B4
+++ b/tests/heal/fix_face_size/B4
@@ -1,3 +1 @@
-puts "TODO OCC24156 MacOS: Faulty shapes in variables faulty_1 to faulty_"
-
 restore [locate_data_file CTO900_pro5363c.rle] a

diff --git a/tests/heal/fix_face_size/C1 b/tests/heal/fix_face_size/C1
index 4b036ed3385409057069010134908c7badba851e..668b1f997cf51d69209ece1a42e7ec04457d236e 100644 (file)
--- a/tests/heal/fix_face_size/C1
+++ b/tests/heal/fix_face_size/C1
@@ -1,6 +1,5 @@
 if { [info exists bug23197] == 0 || $bug23197 == 0 } {
     puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2"
 }
-puts "TODO OCC24156 MacOS: Faulty shapes in variables faulty_1 to faulty_"
 
 restore [locate_data_file rrr.rle] a

diff --git a/tests/offset/faces_type_i/D7 b/tests/offset/faces_type_i/D7
index dd9383af542db58c14c00b34a52ca0d86e292f6a..b8457ff1bd3ae1149c876190e8d827108eefba52 100644 (file)
--- a/tests/offset/faces_type_i/D7
+++ b/tests/offset/faces_type_i/D7
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2

diff --git a/tests/offset/faces_type_i/E7 b/tests/offset/faces_type_i/E7
index 0be2810d3ad204725035f52290af5f2992537f63..e7e6bf6e861555d255c935406991ddecf864a97b 100755 (executable)
--- a/tests/offset/faces_type_i/E7
+++ b/tests/offset/faces_type_i/E7
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC23748 ALL: Error: The command cannot be built"
 puts "TODO OCC26556 ALL: Error : The offset cannot be built."

diff --git a/tests/offset/faces_type_i/E8 b/tests/offset/faces_type_i/E8
index a11a388ca7b00f75f4fa29d20a5be8bbc1b780e2..ae5390c035879a0fe4d663c762d6ec2b13615547 100644 (file)
--- a/tests/offset/faces_type_i/E8
+++ b/tests/offset/faces_type_i/E8
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC23748 ALL: Error: The command cannot be built"
 puts "TODO OCC26556 ALL: Error : The offset cannot be built."

diff --git a/tests/offset/faces_type_i/E9 b/tests/offset/faces_type_i/E9
index ec5307350fcd8e646a5b723413d8ae05c85c4721..ce262e992761752aa69478e1651ea904bee5e077 100644 (file)
--- a/tests/offset/faces_type_i/E9
+++ b/tests/offset/faces_type_i/E9
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC23748 ALL: Error: The command cannot be built"
 puts "TODO OCC26556 ALL: Error : The offset cannot be built."

diff --git a/tests/offset/faces_type_i/F2 b/tests/offset/faces_type_i/F2
index 0d23b75d5f10935de63aea121f13c737534bbb11..a03b4226c47aecd952885e7fcf85809fbcd8abb1 100755 (executable)
--- a/tests/offset/faces_type_i/F2
+++ b/tests/offset/faces_type_i/F2
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC23748 ALL: Error: The command cannot be built"
 puts "TODO OCC26556 ALL: Error : The offset cannot be built."

diff --git a/tests/offset/faces_type_i/F3 b/tests/offset/faces_type_i/F3
index 6243913d5b3c0a1ec15fb1b0be80bd48cd210e45..1455e685b01a777cbd0ada589c166c00db846386 100644 (file)
--- a/tests/offset/faces_type_i/F3
+++ b/tests/offset/faces_type_i/F3
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC23748 ALL: Error: The command cannot be built"
 puts "TODO OCC26556 ALL: Error : The offset cannot be built."

diff --git a/tests/offset/faces_type_i/F4 b/tests/offset/faces_type_i/F4
index 8fcbf2bd3642234c3ef8aac9a9203b4f5fe9e5a4..e4d28a5b68c89e28f706d2ee7619db329c6fd105 100644 (file)
--- a/tests/offset/faces_type_i/F4
+++ b/tests/offset/faces_type_i/F4
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC23748 ALL: Error: The command cannot be built"
 puts "TODO OCC26556 ALL: Error : The offset cannot be built."

diff --git a/tests/offset/faces_type_i/F5 b/tests/offset/faces_type_i/F5
index 8441586e46e69c2c7ead8b29e234e6c256881fa8..981e293efc39056fa74634eefdf5bd02d41ee746 100644 (file)
--- a/tests/offset/faces_type_i/F5
+++ b/tests/offset/faces_type_i/F5
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC23748 ALL: Error: The command cannot be built"
 puts "TODO OCC26556 ALL: Error : The offset cannot be built."

diff --git a/tests/offset/faces_type_i/G5 b/tests/offset/faces_type_i/G5
index 1a7f05e893df563da237261d8cc739b8ee4ccfa2..08d0a623f4946c30dae42265fa6ebb7529df3579 100644 (file)
--- a/tests/offset/faces_type_i/G5
+++ b/tests/offset/faces_type_i/G5
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2

diff --git a/tests/offset/faces_type_i/L1 b/tests/offset/faces_type_i/L1
index 37e058c409c66ce09bc166e3c028d0714a6e44fc..114c2f1f313ec72e0fc21274bf71c0e238820665 100644 (file)
--- a/tests/offset/faces_type_i/L1
+++ b/tests/offset/faces_type_i/L1
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 bsplinecurve w1 3 2  -1.0 4   1.0 4  0 0 0 1  2 10 0 1  4 6 0 1  10 0 0 1
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/L2 b/tests/offset/faces_type_i/L2
index fdae0a42bf2e4eaf16500b5aacf8d04c1ec7440b..0b9cd25330fad2f1788edfdbb84d8db0b6b0ed05 100644 (file)
--- a/tests/offset/faces_type_i/L2
+++ b/tests/offset/faces_type_i/L2
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 bsplinecurve w1 3 2  -1.0 4   1.0 4  0 0 0 1  2 10 0 1  4 6 0 1  10 0 0 1
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/L3 b/tests/offset/faces_type_i/L3
index 337e9f019bde3b7b39be2fbc10e5d8bb40bbac84..238c5e503466bc62ba25d1b7922b4ddeed56f4ba 100644 (file)
--- a/tests/offset/faces_type_i/L3
+++ b/tests/offset/faces_type_i/L3
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 bsplinecurve w1 3 2  -1.0 4   1.0 4  0 0 0 1  2 10 0 1  4 6 0 1  10 0 0 1
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/L4 b/tests/offset/faces_type_i/L4
index 8ab2418c93bd9c94ffa161c5fe5ee0e4b7732acf..b77d490eeaed9be7a3da0807691259ebc17a0197 100644 (file)
--- a/tests/offset/faces_type_i/L4
+++ b/tests/offset/faces_type_i/L4
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 bsplinecurve w1 3 2  -1.0 4   1.0 4  0 0 0 1  2 10 0 1  4 6 0 1  10 0 0 1
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/L5 b/tests/offset/faces_type_i/L5
index 7741b82d8f0487070626d251f023343983dbe67a..5ccdc38f9b6e60bec4c06da6bad84ed0a2b52a1d 100644 (file)
--- a/tests/offset/faces_type_i/L5
+++ b/tests/offset/faces_type_i/L5
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 bsplinecurve w1 3 2  -1.0 4   1.0 4  0 0 0 1  2 10 0 1  4 6 0 1  10 0 0 1
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/L6 b/tests/offset/faces_type_i/L6
index 1d9941aec7827a801aef409a01b16b69f8ab5be8..daf9ead66011d806ffb532c242398b4670e30567 100644 (file)
--- a/tests/offset/faces_type_i/L6
+++ b/tests/offset/faces_type_i/L6
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 bsplinecurve w1 3 2  -1.0 4   1.0 4  0 0 0 1  2 10 0 1  4 6 0 1  10 0 0 1
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/L7 b/tests/offset/faces_type_i/L7
index 700bf53df1b6997cfa7114b2027785f57b795445..b96fef670f950b81b19a35a7d066fca72ef0308e 100644 (file)
--- a/tests/offset/faces_type_i/L7
+++ b/tests/offset/faces_type_i/L7
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 beziercurve w1 5 0 0 0 20 0 0 20 5 0 25 10 0 10 20 0
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/L8 b/tests/offset/faces_type_i/L8
index 8393f947457d3fc7e64b1d6bad16d7dfac08dc5f..7a32b347072787a2f368871816e85f20af91ccfc 100644 (file)
--- a/tests/offset/faces_type_i/L8
+++ b/tests/offset/faces_type_i/L8
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 beziercurve w1 5 0 0 0 20 0 0 20 5 0 25 10 0 10 20 0
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/L9 b/tests/offset/faces_type_i/L9
index f902f4c5c5cbeaff89d454caac4f4bc64d03e462..1b2538bc4a64dffe29ea6589248cd983e34a6316 100644 (file)
--- a/tests/offset/faces_type_i/L9
+++ b/tests/offset/faces_type_i/L9
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 beziercurve w1 5 0 0 0 20 0 0 20 5 0 25 10 0 10 20 0
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/M1 b/tests/offset/faces_type_i/M1
index 5678bbb7300fea99f7a822c0b3c2379a7cb21a85..d7c1a6c8ce96cdaca457d13481239db13c76c286 100644 (file)
--- a/tests/offset/faces_type_i/M1
+++ b/tests/offset/faces_type_i/M1
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 beziercurve w1 5 0 0 0 20 0 0 20 5 0 25 10 0 10 20 0
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/M3 b/tests/offset/faces_type_i/M3
index a196f13a9fba8bb8c815ce0c9d68b2e299e78d4a..a40299bd18fe9066dd3000ca898e1dd668258588 100644 (file)
--- a/tests/offset/faces_type_i/M3
+++ b/tests/offset/faces_type_i/M3
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 beziercurve w1 5 0 0 0 20 0 0 20 5 0 25 10 0 10 20 0
 mkedge w1 w1 

diff --git a/tests/offset/faces_type_i/N1 b/tests/offset/faces_type_i/N1
index da57c569ca58901dc94329f364103f47f13a6f10..9eabbc2bfe473ad780d6f61a89aee35a0d432ad6 100644 (file)
--- a/tests/offset/faces_type_i/N1
+++ b/tests/offset/faces_type_i/N1
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
 puts "TODO OCC23748 ALL: Error: The command cannot be built"
 puts "TODO OCC26556 ALL: Error : The offset cannot be built."

diff --git a/tests/offset/faces_type_i/N2 b/tests/offset/faces_type_i/N2
index ba67fa81c4e0bbc9c54ba0df83cbe374399f4553..09b19368fab40eb58da6d462f9b05e6223c5ef70 100644 (file)
--- a/tests/offset/faces_type_i/N2
+++ b/tests/offset/faces_type_i/N2
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 beziersurf c 3 2 \
 0 0 0 0 5 5 2 14 3 \

diff --git a/tests/offset/shape_type_i/C5 b/tests/offset/shape_type_i/C5
index 3b5ecef1e62ad33f545c434db549fd502049a501..40388fda62fc7bc54c3f95cc79ee321c66f375c0 100644 (file)
--- a/tests/offset/shape_type_i/C5
+++ b/tests/offset/shape_type_i/C5
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 puts "TODO OCC23068 ALL: Error: bsection of the result and s is not equal to zero."
 
 ellipse w1 0 0 0 15 10

diff --git a/tests/offset/shape_type_i/D6 b/tests/offset/shape_type_i/D6
index 3bf8a677231f2983b909ffbaeeb64f614afe65ee..682d7e2a42b7484ba21c17c1dfa9f34ace796a07 100755 (executable)
--- a/tests/offset/shape_type_i/D6
+++ b/tests/offset/shape_type_i/D6
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2

diff --git a/tests/offset/shape_type_i/D7 b/tests/offset/shape_type_i/D7
index dd9383af542db58c14c00b34a52ca0d86e292f6a..b8457ff1bd3ae1149c876190e8d827108eefba52 100755 (executable)
--- a/tests/offset/shape_type_i/D7
+++ b/tests/offset/shape_type_i/D7
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2

diff --git a/tests/offset/shape_type_i/G2 b/tests/offset/shape_type_i/G2
index bc83d058f4ff890f7d1b0ebb10daa2a95ad79486..8914a691417a4d0bcc9c86f62b39750cea0654ae 100644 (file)
--- a/tests/offset/shape_type_i/G2
+++ b/tests/offset/shape_type_i/G2
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 bsplinecurve w1 3 2  -1.0 4   1.0 4  0 0 0 1  2 10 0 1  4 6 0 1  10 0 0 1
 mkedge w1 w1 

diff --git a/tests/offset/shape_type_i/G3 b/tests/offset/shape_type_i/G3
index 8c6c29b743b6023cc0a6cd665a64895f8d5359db..d8369b334186a54d03f2c141f5375c0cf9bb70cb 100644 (file)
--- a/tests/offset/shape_type_i/G3
+++ b/tests/offset/shape_type_i/G3
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 bsplinecurve w1 3 2  -1.0 4   1.0 4  0 0 0 1  2 10 0 1  4 6 0 1  10 0 0 1
 mkedge w1 w1 

diff --git a/tests/offset/shape_type_i/G4 b/tests/offset/shape_type_i/G4
index 05427f1500c13b7d41904f45ed9a51cbe3b639aa..3eb0b6b4a66161b243e13adfd97763f61cc3198c 100644 (file)
--- a/tests/offset/shape_type_i/G4
+++ b/tests/offset/shape_type_i/G4
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
+
+
 
 beziercurve w1 5 0 0 0 20 0 0 20 5 0 25 10 0 10 20 0
 mkedge w1 w1 

diff --git a/tests/offset/wire_closed_inside_0_005/I8 b/tests/offset/wire_closed_inside_0_005/I8
index f91c587055779180b6b83f1c9db95655c24d1f23..860ae919c35ca628940360b9355c9aee3c1bbb17 100644 (file)
--- a/tests/offset/wire_closed_inside_0_005/I8
+++ b/tests/offset/wire_closed_inside_0_005/I8
@@ -1,5 +1,3 @@
-puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
-
 restore [locate_data_file offset_wire_103.brep] s
 
 set length 316.751

diff --git a/tests/offset/wire_closed_inside_0_025/I8 b/tests/offset/wire_closed_inside_0_025/I8
index 37f5dfcd257004cdfd75b4a86a7abe29c78a34e4..67ae397f1822194b32e83a5f174680e71fba32bd 100644 (file)
--- a/tests/offset/wire_closed_inside_0_025/I8
+++ b/tests/offset/wire_closed_inside_0_025/I8
@@ -1,5 +1,3 @@
-puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
-
 restore [locate_data_file offset_wire_103.brep] s
 
 set length 245.13

diff --git a/tests/offset/wire_closed_inside_0_075/I8 b/tests/offset/wire_closed_inside_0_075/I8
index dc1b681910bd580ba5dd44ada29afc61f96b3d6c..35c73defcbe061d056516d6a6209cfee90b93637 100644 (file)
--- a/tests/offset/wire_closed_inside_0_075/I8
+++ b/tests/offset/wire_closed_inside_0_075/I8
@@ -1,5 +1,3 @@
-puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
-
 restore [locate_data_file offset_wire_103.brep] s
 
 set length 94.1559

diff --git a/tests/offset/wire_closed_outside_0_005/I4 b/tests/offset/wire_closed_outside_0_005/I4
index 17d771befc4cc53b7584af2bfeb65af10b783f92..a4c2518f8d85a55ac4eac16ac231fa48a8224a56 100644 (file)
--- a/tests/offset/wire_closed_outside_0_005/I4
+++ b/tests/offset/wire_closed_outside_0_005/I4
@@ -1,4 +1,3 @@
-puts "TODO OCC23068 MacOS: Error : The resulting shape is WRONG"
 restore [locate_data_file offset_wire_099.brep] s
 
 set length 302.636

diff --git a/tests/offset/wire_closed_outside_0_025/I4 b/tests/offset/wire_closed_outside_0_025/I4
index 7989da0adccdc66d06d4d010c6b8c6ad9cd39723..def7fbfca6ea2c20b7f307bd023ea3a678d2b803 100644 (file)
--- a/tests/offset/wire_closed_outside_0_025/I4
+++ b/tests/offset/wire_closed_outside_0_025/I4
@@ -1,4 +1,3 @@
-puts "TODO OCC23068 MacOS: Error : The resulting shape is WRONG"
 restore [locate_data_file offset_wire_099.brep] s
 
 set length 325.844

diff --git a/tests/offset/wire_unclosed_outside_0_075/A1 b/tests/offset/wire_unclosed_outside_0_075/A1
index ba1098ee70feecde4cf92625cc3412dadac1b65c..8f22fbfb58efda5d2914338fd4fe9dc50cea2921 100644 (file)
--- a/tests/offset/wire_unclosed_outside_0_075/A1
+++ b/tests/offset/wire_unclosed_outside_0_075/A1
@@ -1,6 +1,9 @@
-puts "TODO OCC23748 ALL: Error : The offset cannot be built."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC23748 ALL: Error: Offset is not done."
+puts "TODO OCC23748 Windows: Error : The offset cannot be built."
+puts "TODO OCC23748 Windows: Error: The command cannot be built"
+puts "TODO OCC23748 Windows: Error: Offset is not done."
+puts "TODO OCC23748 Linux: Error : The offset cannot be built."
+puts "TODO OCC23748 Linux: Error: The command cannot be built"
+puts "TODO OCC23748 Linux: Error: Offset is not done."
 puts "TODO OCC24156 MacOS: Error : The length of result shape is"
 puts "TODO OCC24156 MacOS: Error : The resulting shape is WRONG"
 

diff --git a/tests/opengl/data/transparency/oit b/tests/opengl/data/transparency/oit
index a6f004731bd293526ce89dc9e56370835adfa2cb..442462a8bccdb73ca79f90736ef3ae418609291e 100644 (file)
--- a/tests/opengl/data/transparency/oit
+++ b/tests/opengl/data/transparency/oit
@@ -43,7 +43,7 @@ vcaps -opaqueAlpha 0
 
 # VTK viewer, just for comparison
 set hasVtk 0
-if { [vdriver -default] == "TKOpenGl" } {
+if { [vdriver -default] == "TKOpenGl" && $::tcl_platform(os) != "Darwin" } {
   set hasVtk 1
   if { [catch { pload VIS }] } { set hasVtk 0 }
 }

diff --git a/tests/perf/modalg/bug453_1 b/tests/perf/modalg/bug453_1
index 82b70d1541a068c60f411f039cbcec87e491288c..5992fbe52376f4375f352f8f7c82e618aca548d7 100644 (file)
--- a/tests/perf/modalg/bug453_1
+++ b/tests/perf/modalg/bug453_1
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: Tcl Exception:"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "========"
 puts "OCC453"
 puts "(case 1)"

diff --git a/tests/perf/moddata/bug453_3 b/tests/perf/moddata/bug453_3
index 54407e07a6f9a0c06be749e9964da394df7dd7e3..244fe932910848a7f0f7e4e2cc5499e46336a613 100644 (file)
--- a/tests/perf/moddata/bug453_3
+++ b/tests/perf/moddata/bug453_3
@@ -1,5 +1,3 @@
-puts "TODO OCC24156 MacOS: Tcl Exception: tolerance ang"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
 puts "TODO OCC27203 ALL: Error: Max tolerance" 
 ##puts "TODO OCC27203 All: Error : The area of result shape is"
 

diff --git a/tests/v3d/bugs/bug288_6 b/tests/v3d/bugs/bug288_6
index 128e475e3585d985a6048c131dd4f037ab3c0eef..7a5abd5c81c06d9458aeb32e8312bbb7ba859a4d 100644 (file)
--- a/tests/v3d/bugs/bug288_6
+++ b/tests/v3d/bugs/bug288_6
@@ -2,8 +2,6 @@ puts "================"
 puts "OCC288: Currently meshing (for shading) of some shapes looks incorrect"
 puts "================"
 puts ""
-puts "TODO #23828 MacOS: Tcl Exception: result is not a topological shape!!!"
-puts "TODO #23828 MacOS: TEST INCOMPLETE"
 
 pload MODELING VISUALIZATION
 restore [locate_data_file OCC288-shading_176.brep] result