Adjusting testing cases for current state of OCCT

diff --git a/tests/bugs/demo/CR23416 b/tests/bugs/demo/CR23416
index c5e89ce..5222cae 100755 (executable)
--- a/tests/bugs/demo/CR23416
+++ b/tests/bugs/demo/CR23416
@@ -8,10 +8,13 @@ puts ""
 
 isos 2
 smallview
-if [catch { restore [locate_data_file CR23416-ProblemFace.brep] result } res] {
+set info [restore [locate_data_file CR23416-ProblemFace.brep] result]
+set check_error [lsearch $info exception]
+if { $check_error != -1 } {
     puts "Error : crashes during visualization"
 }
 fit
 set only_xwd 1
 
 
+

diff --git a/tests/bugs/modalg/CR23137_1 b/tests/bugs/modalg/CR23137_1
index b7384a9..cd7ab82 100755 (executable)
--- a/tests/bugs/modalg/CR23137_1
+++ b/tests/bugs/modalg/CR23137_1
@@ -6,7 +6,7 @@ puts ""
 # Class BRepAlgoAPI_Cut does not made correct result on attached shapes.
 ##########################################################################################################
 
-restore [locate_data_file CR23137-bspl_cut.brep] b
+restore [locate_data_file bug23137_bspl_cut.brep] b
 explode b
 copy b_1 b1
 copy b_2 b2

diff --git a/tests/bugs/modalg/CR23137_2 b/tests/bugs/modalg/CR23137_2
index 9f5934f..92a35b1 100755 (executable)
--- a/tests/bugs/modalg/CR23137_2
+++ b/tests/bugs/modalg/CR23137_2
@@ -6,7 +6,7 @@ puts ""
 # Class BRepAlgoAPI_Cut does not made correct result on attached shapes.
 ##########################################################################################################
 
-restore [locate_data_file CR23137-rev_cut.brep] b
+restore [locate_data_file bug23137_rev_cut.brep] b
 explode b
 copy b_1 b1
 copy b_2 b2

diff --git a/tests/bugs/modalg/CR23394 b/tests/bugs/modalg/CR23394
index 7b2746c..d099a3d 100755 (executable)
--- a/tests/bugs/modalg/CR23394
+++ b/tests/bugs/modalg/CR23394
@@ -6,7 +6,7 @@ puts ""
 # Problem with BRepOffset_MakeOffset on a cylindrical face
 ##########################################################################################################
 
-restore [locate_data_file CR23394-Circular_tube.brep] sh1
+restore [locate_data_file bug23394_Circular_tube.brep] sh1
 
 thickshell result sh1 5
 

diff --git a/tests/bugs/vis/CR23425 b/tests/bugs/vis/CR23425
index e412f8f..c17b645 100755 (executable)
--- a/tests/bugs/vis/CR23425
+++ b/tests/bugs/vis/CR23425
@@ -6,5 +6,6 @@ puts ""
 # diffimage generate OSD_Exception during execution
 #######################################################################
 
-diffimage [locate_data_file CR23425-B8_Linux.gif] [locate_data_file CR23425-B8_Win.gif] 0.01 0 1
-diffimage [locate_data_file CR23425-B8_Win.gif] [locate_data_file CR23425-B8_Linux.gif] 0.01 0 1
+diffimage [locate_data_file bug23425_B8_Linux.gif] [locate_data_file bug23425_B8_Win.gif] 0.01 0 1
+diffimage [locate_data_file bug23425_B8_Win.gif] [locate_data_file bug23425_B8_Linux.gif] 0.01 0 1
+

diff --git a/tests/chamfer/data/complex/B9 b/tests/chamfer/data/complex/B9
index a126cdf..fc5400a 100644 (file)
--- a/tests/chamfer/data/complex/B9
+++ b/tests/chamfer/data/complex/B9
@@ -12,14 +12,15 @@ if { [string compare $command chamf_sequence] == 0 } {
     set os $env(os_type)
   }
   if { [string compare ${os} "Windows-64-VC9"] != 0 && [string compare ${os} "Windows-64-VC10"] != 0} {
-    set nf 1
+    set nf 0
     if { [string compare $group equal_dist] == 0 } {
       if {[string compare $os "Debian40"] == 0 || [string compare $os "Mandriva2008"] == 0 || [string compare $os "Mandriva2010"] == 0} {
         set nf 4
       }
     }
     if { [string compare $group dist_dist] == 0 && [string compare $os "Mandriva2010"] == 0 } {
-      set nf 2
+      ##set nf 2
+      set nf 0
     }
     if { $nf != 0 } {
       #puts "TODO OCC22909 $os:Faulty shapes in variables faulty_1 to faulty_$nf"

diff --git a/tests/heal/data/standard/D5 b/tests/heal/data/standard/D5
index 036f7f8..04d5511 100644 (file)
--- a/tests/heal/data/standard/D5
+++ b/tests/heal/data/standard/D5
@@ -1,5 +1,6 @@
 if { [string compare $command "ShapeConvertRev"] == 0 } {
-   puts "TODO OCC23127 ALL: Error : The square of result shape is"
+## Dont reproduced IR-2012-10-15-IR-2012-10-12
+##   puts "TODO OCC23127 ALL: Error : The square of result shape is"
 }
 restore [locate_data_file CTO904_cts20549b.rle] a
 

diff --git a/tests/xcaf/brep_to_stp_add_CL/I6 b/tests/xcaf/brep_to_stp_add_CL/I6
index bf5cc54..f947b6b 100644 (file)
--- a/tests/xcaf/brep_to_stp_add_CL/I6
+++ b/tests/xcaf/brep_to_stp_add_CL/I6
@@ -10,7 +10,8 @@ puts "TODO OCC23213 ALL: Error : Compared documents have different LAYERS for sh
 
 puts "TODO OCC23213 ALL: Error : Compared documents have different LAYERS for shape located on 0:1:1:18 label"
 
-puts "TODO OCC23213 ALL: Error : Compared documents have different LAYERS for shape located on 0:1:1:23 label"
+###don't reproduced IR-2012-10-15-IR-2012-10-12
+###puts "TODO OCC23213 ALL: Error : Compared documents have different LAYERS for shape located on 0:1:1:23 label"
 
 puts "TODO OCC23213 ALL: Error : errors occur during test"
 

diff --git a/tests/xcaf/igs_to_dxc/A6 b/tests/xcaf/igs_to_dxc/A6
index f82ea13..4566208 100644 (file)
--- a/tests/xcaf/igs_to_dxc/A6
+++ b/tests/xcaf/igs_to_dxc/A6
@@ -1,4 +1,4 @@
-ReadIges D_First [locate_data_file Samtech_Disc.igs]
+ReadIges D_First [locate_data_file Disc.igs]
 set TypeOfFile ""
 set AddToDocument ""
 set CompareDocumentsMode "ALL CHECKSHAPE"