From 0e443e130c2cf2b7ef9ec5f54f1a9ae78c74830a Mon Sep 17 00:00:00 2001 From: apn Date: Thu, 15 Mar 2018 17:13:16 +0300 Subject: [PATCH] 0028097: Test system does not recognize 'fail...' messages as errors Test parse rules are improved to recognize messages with word 'fail' or 'failure' as errors. Test cases are corrected accordingly (TODO or REQUIRED statements added where fail messages were not noticed previously). --- src/QABugs/QABugs_19.cxx | 2 +- tests/boolean/bfuse_complex/R9 | 2 + tests/boolean/bfuse_complex/S1 | 3 +- tests/bugs/mesh/bug24923 | 2 +- tests/bugs/mesh/bug24938 | 1 + tests/bugs/mesh/bug26664 | 26 ++------ tests/bugs/modalg_1/bug12918 | 2 + tests/bugs/modalg_4/bug697_2 | 2 + tests/bugs/modalg_4/bug697_4 | 2 + tests/bugs/modalg_4/bug697_7 | 2 + tests/bugs/modalg_4/bug697_8 | 2 + tests/bugs/modalg_4/bug825 | 2 + tests/bugs/modalg_5/bug22829 | 2 + tests/bugs/modalg_5/bug24003 | 2 + tests/bugs/modalg_5/bug24764 | 2 + tests/bugs/modalg_5/bug25625 | 2 + tests/bugs/modalg_5/bug25980 | 3 + tests/bugs/modalg_6/bug24161 | 2 + tests/bugs/modalg_6/bug27873 | 2 + tests/bugs/modalg_6/bug28283 | 2 + tests/bugs/modalg_7/bug21134 | 1 + tests/bugs/modalg_7/bug26225_1 | 3 +- tests/bugs/modalg_7/bug26225_2 | 3 +- tests/bugs/modalg_7/bug28150_1 | 2 + tests/bugs/moddata_1/bug150_1 | 1 + tests/bugs/moddata_1/bug150_2 | 1 + tests/bugs/moddata_1/bug15519 | 1 + tests/bugs/moddata_2/bug308 | 2 + tests/bugs/moddata_3/bug25892_01 | 3 + tests/bugs/moddata_3/bug25892_02 | 3 + tests/bugs/vis/buc60858 | 2 + tests/bugs/vis/bug21970 | 1 + tests/bugs/vis/bug22849 | 2 + tests/caf/bugs/D2 | 4 +- tests/caf/parse.rules | 2 - tests/chamfer/data/complex/A3 | 2 +- tests/chamfer/data/complex/A5 | 4 +- tests/chamfer/data/complex/B5 | 8 +-- tests/chamfer/data/complex/B6 | 8 +-- tests/chamfer/data/complex/B7 | 8 +-- tests/chamfer/data/complex/B8 | 2 +- tests/chamfer/data/complex/C1 | 2 +- tests/chamfer/data/simple/A1 | 2 +- tests/de/end | 106 ++++++++++++++++++++----------- tests/de/iges_1/B6 | 1 + tests/de/iges_1/J9 | 1 + tests/de/iges_2/D4 | 1 + tests/de/step_1/D7 | 1 + tests/de/step_1/I1 | 3 + tests/de/step_1/J6 | 1 + tests/de/step_1/O3 | 3 + tests/de/step_1/R3 | 1 + tests/de/step_1/S2 | 1 + tests/de/step_1/ZA7 | 3 + tests/de/step_2/E6 | 1 + tests/de/step_2/E7 | 1 + tests/de/step_2/G2 | 1 + tests/de/step_2/G5 | 2 + tests/de/step_2/H2 | 3 + tests/de/step_2/M5 | 3 + tests/de/step_2/N6 | 1 + tests/de/step_2/R5 | 1 + tests/de/step_3/A4 | 1 + tests/de/step_3/B9 | 1 + tests/de/step_3/D9 | 1 + tests/de/step_3/E5 | 1 + tests/de/step_3/E6 | 1 + tests/de/step_4/A7 | 3 + tests/de/step_4/B2 | 3 + tests/de/step_4/B3 | 1 + tests/de/step_4/B4 | 3 + tests/heal/data/advanced/F1 | 4 +- tests/heal/data/advanced/F2 | 5 +- tests/heal/data/advanced/F3 | 4 +- tests/mesh/data/standard/O5 | 3 + tests/mesh/data/standard/U4 | 4 +- tests/mesh/data/standard/V6 | 3 + tests/parse.rules | 3 + tests/perf/modalg/bug10160_1 | 1 + tests/perf/modalg/bug10160_2 | 1 + tests/perf/modalg/bug10160_3 | 2 + tests/perf/modalg/bug10160_4 | 2 + 82 files changed, 224 insertions(+), 90 deletions(-) diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx index 88ad638429..2926e7adde 100644 --- a/src/QABugs/QABugs_19.cxx +++ b/src/QABugs/QABugs_19.cxx @@ -3480,7 +3480,7 @@ static Standard_Integer OCC24923( const Standard_Real aDeviation = 1. - (Standard_Real)(aPointsNb - aFailedNb) / (Standard_Real)aPointsNb; - theDI << "Number of failed cases: " << aFailedNb << " (Total " << aPointsNb << ")\n"; + theDI << "Number of incorrect cases: " << aFailedNb << " (Total " << aPointsNb << ")\n"; if (aDeviation > aMaxDeviation) { theDI << "Failed. Number of incorrect results is too huge: " << diff --git a/tests/boolean/bfuse_complex/R9 b/tests/boolean/bfuse_complex/R9 index afa58fec04..930619b38b 100644 --- a/tests/boolean/bfuse_complex/R9 +++ b/tests/boolean/bfuse_complex/R9 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + #jmu #pro18457 #cascade 2.1 diff --git a/tests/boolean/bfuse_complex/S1 b/tests/boolean/bfuse_complex/S1 index 2a85682d6e..ea5f89f8b3 100644 --- a/tests/boolean/bfuse_complex/S1 +++ b/tests/boolean/bfuse_complex/S1 @@ -1,8 +1,9 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "PRO15946" puts "Fuse" puts "" - restore [locate_data_file CFE900_uki60gfk.rle] base restore [locate_data_file uki60919b.brep] cont diff --git a/tests/bugs/mesh/bug24923 b/tests/bugs/mesh/bug24923 index 8efe17e809..1514d0b9aa 100644 --- a/tests/bugs/mesh/bug24923 +++ b/tests/bugs/mesh/bug24923 @@ -12,5 +12,5 @@ set bug_info [OCC24923] set num_failed [string range [lindex $bug_info 12] 0 [expr {[string first "%" [lindex $bug_info 12]] - 1}]] set max_failed [string range [lindex $bug_info 14] 0 [expr {[string first "%" [lindex $bug_info 14]] - 1}]] if {$num_failed > $max_failed} { - puts "ERROR: OCC24923 is reproduced. Number of failed tests is too large ($num_failed > $max_failed)." + puts "ERROR: OCC24923 is reproduced. Number of incorrect tests is too large ($num_failed > $max_failed)." } diff --git a/tests/bugs/mesh/bug24938 b/tests/bugs/mesh/bug24938 index f5104d8050..07e17c45c7 100644 --- a/tests/bugs/mesh/bug24938 +++ b/tests/bugs/mesh/bug24938 @@ -1,3 +1,4 @@ +puts "TODO OCC24938 ALL: Meshing statuses: Failure ReMesh" puts "TODO OCC24938 ALL: Error: Number of triangles is equal to 0" puts "TODO OCC24938 ALL: Error: Number of nodes is equal to 0" #puts "TODO OCC24938 ALL: Error : area by triangles differs from the actual area by" diff --git a/tests/bugs/mesh/bug26664 b/tests/bugs/mesh/bug26664 index 9adfdf541d..f3c38a901e 100644 --- a/tests/bugs/mesh/bug26664 +++ b/tests/bugs/mesh/bug26664 @@ -8,25 +8,11 @@ puts "" restore [locate_data_file bug26664_f.brep] a -#1 -vinit -vsetdispmode 1 -vdisplay a -vfit -vdump ${imagedir}/${casename}_1.png +# adaptive meshing is OK +tclean a +incmesh a 1e-4 -adaptive -#2 +# non-adaptive meshing fails +puts "TODO 26664 ALL: Meshing statuses: Failure" +tclean a incmesh a 1e-4 -vdisplay a -vdump ${imagedir}/${casename}_2.png - -#3 -set log2 [incmesh a 1e-4 -adaptive] -vdisplay a -vdump ${imagedir}/${casename}_3.png - -if { [regexp "NoError" ${log2}] == 1 } { - puts "OK : Triangulating a very small polygon is good" -} else { - puts "Error : Triangulating a very small polygon fails" -} diff --git a/tests/bugs/modalg_1/bug12918 b/tests/bugs/modalg_1/bug12918 index 89036d6ee5..79cd27df43 100755 --- a/tests/bugs/modalg_1/bug12918 +++ b/tests/bugs/modalg_1/bug12918 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "============" puts "OCC12918" puts "============" diff --git a/tests/bugs/modalg_4/bug697_2 b/tests/bugs/modalg_4/bug697_2 index f3fbf27ced..cbe47324fb 100755 --- a/tests/bugs/modalg_4/bug697_2 +++ b/tests/bugs/modalg_4/bug697_2 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "============" puts "OCC697" puts "============" diff --git a/tests/bugs/modalg_4/bug697_4 b/tests/bugs/modalg_4/bug697_4 index ee86ee2fb4..b1fa3326aa 100755 --- a/tests/bugs/modalg_4/bug697_4 +++ b/tests/bugs/modalg_4/bug697_4 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "============" puts "OCC697" puts "============" diff --git a/tests/bugs/modalg_4/bug697_7 b/tests/bugs/modalg_4/bug697_7 index 4462acb572..5d696c848e 100755 --- a/tests/bugs/modalg_4/bug697_7 +++ b/tests/bugs/modalg_4/bug697_7 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "============" puts "OCC697" puts "============" diff --git a/tests/bugs/modalg_4/bug697_8 b/tests/bugs/modalg_4/bug697_8 index fc23c71d0a..d8e513d0b9 100755 --- a/tests/bugs/modalg_4/bug697_8 +++ b/tests/bugs/modalg_4/bug697_8 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "============" puts "OCC697" puts "============" diff --git a/tests/bugs/modalg_4/bug825 b/tests/bugs/modalg_4/bug825 index ac50a296a6..1a5d112e0d 100755 --- a/tests/bugs/modalg_4/bug825 +++ b/tests/bugs/modalg_4/bug825 @@ -1,3 +1,5 @@ +puts "TODO OCC25915 ALL: FAILED during Triangulation" +puts "TODO OCC25915 ALL: Triangulation FAILED for 1 of 2 Faces" puts "TODO OCC25915 ALL: Faulty OCC825" puts "TODO OCC25915 ALL: Faulty shapes in variables faulty_1 to faulty_" diff --git a/tests/bugs/modalg_5/bug22829 b/tests/bugs/modalg_5/bug22829 index ff6e94fcf3..53082db257 100644 --- a/tests/bugs/modalg_5/bug22829 +++ b/tests/bugs/modalg_5/bug22829 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "==========" puts "OCC22829" puts "==========" diff --git a/tests/bugs/modalg_5/bug24003 b/tests/bugs/modalg_5/bug24003 index 824ee6eeff..56a68b2f3c 100644 --- a/tests/bugs/modalg_5/bug24003 +++ b/tests/bugs/modalg_5/bug24003 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "================" puts "OCC24003" puts "================" diff --git a/tests/bugs/modalg_5/bug24764 b/tests/bugs/modalg_5/bug24764 index 2d8eebeec5..43ca30b0fe 100755 --- a/tests/bugs/modalg_5/bug24764 +++ b/tests/bugs/modalg_5/bug24764 @@ -1,3 +1,5 @@ +puts "TODO CR29596 Windows: Warning: Intersection of pair of shapes has failed" + puts "================" puts "OCC24764" puts "================" diff --git a/tests/bugs/modalg_5/bug25625 b/tests/bugs/modalg_5/bug25625 index 5f57714343..423856aa6a 100644 --- a/tests/bugs/modalg_5/bug25625 +++ b/tests/bugs/modalg_5/bug25625 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "================" puts "OCC25625" puts "================" diff --git a/tests/bugs/modalg_5/bug25980 b/tests/bugs/modalg_5/bug25980 index 5de305cfb9..30ea9566af 100644 --- a/tests/bugs/modalg_5/bug25980 +++ b/tests/bugs/modalg_5/bug25980 @@ -1,3 +1,5 @@ +puts "REQUIRED All: Projection Failed" + puts "========" puts "OCC25980" puts "========" @@ -11,6 +13,7 @@ restore [locate_data_file s1t.draw] s set bug_info [catch {project x c s}] +# Projection should fail due to big distance of projection at curve beginning if {$bug_info == 0} { puts "ERROR: OCC25980 is reproduced." } diff --git a/tests/bugs/modalg_6/bug24161 b/tests/bugs/modalg_6/bug24161 index 2fb91b73c6..d815d352c8 100644 --- a/tests/bugs/modalg_6/bug24161 +++ b/tests/bugs/modalg_6/bug24161 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "==========" puts "OCC24161" puts "==========" diff --git a/tests/bugs/modalg_6/bug27873 b/tests/bugs/modalg_6/bug27873 index 941fae669e..2c956a521a 100644 --- a/tests/bugs/modalg_6/bug27873 +++ b/tests/bugs/modalg_6/bug27873 @@ -1,3 +1,5 @@ +puts "REQUIRED All: filling failed" + puts "============" puts "OCC27873" puts "============" diff --git a/tests/bugs/modalg_6/bug28283 b/tests/bugs/modalg_6/bug28283 index f800db33e6..7acd975afc 100644 --- a/tests/bugs/modalg_6/bug28283 +++ b/tests/bugs/modalg_6/bug28283 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "========" puts "OCC28283" puts "========" diff --git a/tests/bugs/modalg_7/bug21134 b/tests/bugs/modalg_7/bug21134 index 0bd45a2e87..11c20d5c09 100755 --- a/tests/bugs/modalg_7/bug21134 +++ b/tests/bugs/modalg_7/bug21134 @@ -1,3 +1,4 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" puts "TODO OCC21134 ALL: Error: checkshape command does not return faulty shapes" puts "============" diff --git a/tests/bugs/modalg_7/bug26225_1 b/tests/bugs/modalg_7/bug26225_1 index 5e4dbe6ecc..03da5e43b8 100644 --- a/tests/bugs/modalg_7/bug26225_1 +++ b/tests/bugs/modalg_7/bug26225_1 @@ -1,7 +1,6 @@ -puts "TODO OCC26225 ALL: Tcl Exception: compute of chamfer failed" +puts "TODO OCC26225 ALL: compute of chamfer failed" puts "TODO OCC26225 ALL: TEST INCOMPLETE" - puts "========" puts "OCC26225" puts "========" diff --git a/tests/bugs/modalg_7/bug26225_2 b/tests/bugs/modalg_7/bug26225_2 index 3fd36fa171..243e6dbb0d 100644 --- a/tests/bugs/modalg_7/bug26225_2 +++ b/tests/bugs/modalg_7/bug26225_2 @@ -1,7 +1,6 @@ -puts "TODO OCC26225 ALL: Tcl Exception: compute of chamfer failed" +puts "TODO OCC26225 ALL: compute of chamfer failed" puts "TODO OCC26225 ALL: TEST INCOMPLETE" - puts "========" puts "OCC26225" puts "========" diff --git a/tests/bugs/modalg_7/bug28150_1 b/tests/bugs/modalg_7/bug28150_1 index bee594973e..56b22c2e74 100644 --- a/tests/bugs/modalg_7/bug28150_1 +++ b/tests/bugs/modalg_7/bug28150_1 @@ -1,3 +1,5 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" + puts "========" puts "OCC28150" puts "========" diff --git a/tests/bugs/moddata_1/bug150_1 b/tests/bugs/moddata_1/bug150_1 index e36e12482b..8274144020 100755 --- a/tests/bugs/moddata_1/bug150_1 +++ b/tests/bugs/moddata_1/bug150_1 @@ -1,3 +1,4 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" puts "================" diff --git a/tests/bugs/moddata_1/bug150_2 b/tests/bugs/moddata_1/bug150_2 index 9bc333192b..42588b65f7 100755 --- a/tests/bugs/moddata_1/bug150_2 +++ b/tests/bugs/moddata_1/bug150_2 @@ -1,3 +1,4 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" puts "================" diff --git a/tests/bugs/moddata_1/bug15519 b/tests/bugs/moddata_1/bug15519 index b69856f6ca..06ad893219 100755 --- a/tests/bugs/moddata_1/bug15519 +++ b/tests/bugs/moddata_1/bug15519 @@ -1,3 +1,4 @@ +puts "TODO OCC12345 ALL: Meshing statuses: OpenWire SelfIntersectingWire Failure ReMesh" puts "TODO OCC12345 ALL: Error: Number of triangles" puts "TODO OCC12345 ALL: Error: Number of nodes" puts "TODO OCC12345 ALL: Error: Maximal deflection" diff --git a/tests/bugs/moddata_2/bug308 b/tests/bugs/moddata_2/bug308 index 3678031e03..180940034d 100755 --- a/tests/bugs/moddata_2/bug308 +++ b/tests/bugs/moddata_2/bug308 @@ -1,3 +1,5 @@ +puts "REQUIRED All: Projection Failed" + puts "===========" puts " OCC308 " puts "===========" diff --git a/tests/bugs/moddata_3/bug25892_01 b/tests/bugs/moddata_3/bug25892_01 index d5bfb99dff..91a8f9c612 100644 --- a/tests/bugs/moddata_3/bug25892_01 +++ b/tests/bugs/moddata_3/bug25892_01 @@ -1,3 +1,5 @@ +puts "REQUIRED All: Projection Failed" + puts "============" puts "OCC25892" puts "============" @@ -11,6 +13,7 @@ restore [locate_data_file bug25892_f001] f mksurface s f +# Projection should fail due to big distance between curve and surface catch {project cx c s} #v2d2 diff --git a/tests/bugs/moddata_3/bug25892_02 b/tests/bugs/moddata_3/bug25892_02 index dd2b513e1c..ad4abc02dd 100644 --- a/tests/bugs/moddata_3/bug25892_02 +++ b/tests/bugs/moddata_3/bug25892_02 @@ -1,3 +1,5 @@ +puts "REQUIRED All: Projection Failed" + puts "============" puts "OCC25892" puts "============" @@ -11,6 +13,7 @@ restore [locate_data_file bug25892_f002] f mksurface s f +# Projection should fail due to big distance between curve and surface catch {project cx c s} #v2d2 diff --git a/tests/bugs/vis/buc60858 b/tests/bugs/vis/buc60858 index 326a926709..050be0c145 100755 --- a/tests/bugs/vis/buc60858 +++ b/tests/bugs/vis/buc60858 @@ -1,3 +1,5 @@ +puts "TODO CR26106 ALL: Meshing statuses: OpenWire Failure" + puts "============" puts "BUC60858" puts "============" diff --git a/tests/bugs/vis/bug21970 b/tests/bugs/vis/bug21970 index f434892385..56e5b3cbcb 100755 --- a/tests/bugs/vis/bug21970 +++ b/tests/bugs/vis/bug21970 @@ -1,4 +1,5 @@ puts "TODO OCC11111 ALL: Faulty OCC21970" +puts "TODO OCC11111 ALL: Meshing statuses: Failure" puts "TODO OCC11111 ALL: Error : The command is not valid. The area is" puts "TODO OCC11111 ALL: Error : The area of result shape is 0" puts "TODO OCC11111 ALL: Error : is WRONG because number of" diff --git a/tests/bugs/vis/bug22849 b/tests/bugs/vis/bug22849 index 9c4f908c8d..a6ef61c131 100755 --- a/tests/bugs/vis/bug22849 +++ b/tests/bugs/vis/bug22849 @@ -1,3 +1,5 @@ +puts "TODO OCC22849 ALL: Meshing statuses: OpenWire Failure" + puts "============" puts "OCC22849" puts "============" diff --git a/tests/caf/bugs/D2 b/tests/caf/bugs/D2 index c78b3d7e96..b300c2073e 100644 --- a/tests/caf/bugs/D2 +++ b/tests/caf/bugs/D2 @@ -204,8 +204,8 @@ if !$Create_Doc { # Function - if [catch {GetFunction D 0:1:1 fguid failure}] {puts "Error: Function not found" - } elseif {$fguid != $test_guid || $failure != $test_failure} { puts "Error: invalid Function" } + if [catch {GetFunction D 0:1:1 fguid failureNb}] {puts "Error: Function not found" + } elseif {$fguid != $test_guid || $failureNb != $test_failure} { puts "Error: invalid Function" } # AISPresentation diff --git a/tests/caf/parse.rules b/tests/caf/parse.rules index 3a5fb94bd8..c60d88f31e 100755 --- a/tests/caf/parse.rules +++ b/tests/caf/parse.rules @@ -1,5 +1,3 @@ IGNORE /on screen buffer is used for image dump - content might be invalid/ reported when software Microsoft OpenGL driver is used (remote desktop) IGNORE /^\s*DPrsStd_AISColor\s*:\s*Error\b/ ignore presentation K2 error message FAILED /\binvalid\b/ error -FAILED /\bFailed\b/ error -FAILED /\bfailed\b/ error diff --git a/tests/chamfer/data/complex/A3 b/tests/chamfer/data/complex/A3 index 50a9b75aef..bb4f82043b 100644 --- a/tests/chamfer/data/complex/A3 +++ b/tests/chamfer/data/complex/A3 @@ -9,5 +9,5 @@ if { [string compare $command chamf] == 0 } { puts "TODO OCC22909 All:Faulty shapes in variables faulty_1 to faulty_" } } else { - puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 All: compute of chamfer failed" } diff --git a/tests/chamfer/data/complex/A5 b/tests/chamfer/data/complex/A5 index 11a4e86a57..9da88b0f16 100644 --- a/tests/chamfer/data/complex/A5 +++ b/tests/chamfer/data/complex/A5 @@ -5,11 +5,11 @@ set chamf_dist_dist [list "0.03 0.04" "0.05 0.04" "0.05 0.02" "0.03 0.03" "0.05 set chamf_equal_dist [list "0.03 " "0.05 " "0.05 " "0.03 " "0.05 " "0.03 " "0.03 " "0.03 " "0.05 " "0.06 " "0.02 " "0.03 " "0.04 " "0.05 " "0.05 " "0.04 " "0.03 "] if { [string compare $command chamf_sequence] == 0 } { if {[string compare $group dist_angle] == 0} { - puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 All: compute of chamfer failed" puts "TODO OCC22909 All:Faulty shapes in variables faulty_1 to faulty_6" } if {[string compare $group dist_dist] == 0} { - puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 All: compute of chamfer failed" } if {[string compare $group equal_dist] == 0} { puts "TODO OCC22909 All:Faulty shapes in variables faulty_1 to faulty_10" diff --git a/tests/chamfer/data/complex/B5 b/tests/chamfer/data/complex/B5 index fb3b83ded7..ee6673fdf0 100644 --- a/tests/chamfer/data/complex/B5 +++ b/tests/chamfer/data/complex/B5 @@ -5,17 +5,17 @@ set chamf_dist_dist [list "0.1 0.08" "0.12 0.08"] set chamf_equal_dist [list "0.1 " "0.2 "] if { [string compare $command chamf] == 0 } { if {[string compare $group dist_angle] == 0 || [string compare $group equal_dist] == 0} { - puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 All: compute of chamfer failed" } } else { if {[string compare $group dist_angle] == 0} { - puts "TODO OCC22909 MacOS: chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 MacOS: compute of chamfer failed" } if {[string compare $group dist_dist] == 0} { - puts "TODO OCC22909 MacOS: chamfer is not done. compute of chamfer failed" + 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: chamfer is not done. 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 75bfaee80c..899c64cfaf 100644 --- a/tests/chamfer/data/complex/B6 +++ b/tests/chamfer/data/complex/B6 @@ -5,17 +5,17 @@ set chamf_dist_dist [list " 0.1 0.2" " 0.1 0.2"] set chamf_equal_dist [list " 0.1 " "0.1 "] if { [string compare $command chamf] == 0 } { if {[string compare $group dist_angle] == 0 || [string compare $group dist_dist] == 0} { - puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 All: compute of chamfer failed" } } else { if {[string compare $group dist_angle] == 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: compute of chamfer failed" } if {[string compare $group dist_dist] == 0} { - puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed" + puts "TODO OCC24156 MacOS: compute of chamfer failed" } if {[string compare $group equal_dist] == 0} { - puts "TODO OCC24156 MacOS: chamfer is not done. compute of chamfer failed" + puts "TODO OCC24156 MacOS: compute of chamfer failed" } } diff --git a/tests/chamfer/data/complex/B7 b/tests/chamfer/data/complex/B7 index 415dd61335..fccf6ee37d 100644 --- a/tests/chamfer/data/complex/B7 +++ b/tests/chamfer/data/complex/B7 @@ -4,17 +4,17 @@ set chamf_dist_angle [list "0.1 30" "0.08 30"] 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:chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 All: compute of chamfer failed" } else { if {[string compare $group dist_angle] == 0} { - puts "TODO OCC22909 MacOS: chamfer is not done. compute of chamfer failed" + 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: chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 MacOS: compute of chamfer failed" } if {[string compare $group equal_dist] == 0} { - puts "TODO OCC22909 MacOS: chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 MacOS: compute of chamfer failed" } } diff --git a/tests/chamfer/data/complex/B8 b/tests/chamfer/data/complex/B8 index d61bb96762..e875e92d23 100644 --- a/tests/chamfer/data/complex/B8 +++ b/tests/chamfer/data/complex/B8 @@ -4,5 +4,5 @@ set chamf_dist_angle [list " 0.1 30" " 0.1 30" " 0.1 30"] set chamf_dist_dist [list " 0.1 0.2" " 0.2 0.2" " 0.2 0.2"] set chamf_equal_dist [list "0.06 " "0.08 " "0.08 "] if { [string compare $command chamf_sequence] == 0 && [string compare $group dist_dist] == 0 } { - puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 All: compute of chamfer failed" } diff --git a/tests/chamfer/data/complex/C1 b/tests/chamfer/data/complex/C1 index 636f90bf01..e658f86012 100644 --- a/tests/chamfer/data/complex/C1 +++ b/tests/chamfer/data/complex/C1 @@ -5,6 +5,6 @@ set chamf_dist_dist [list "0.01 0.006" "0.008 0.006" "0.01 0.012" "0.015 0.012" set chamf_equal_dist [list "0.01 " "0.008 " "0.01 " "0.015 " "0.01 " "0.008 " "0.01 " "0.008 "] if { [string compare $command chamf] == 0 } { if { [string compare $group equal_dist] != 0 } { - puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 All: compute of chamfer failed" } } diff --git a/tests/chamfer/data/simple/A1 b/tests/chamfer/data/simple/A1 index 59965a5d03..45f1764dbd 100644 --- a/tests/chamfer/data/simple/A1 +++ b/tests/chamfer/data/simple/A1 @@ -4,5 +4,5 @@ set chamf_dist_angle [list ".08 30"] set chamf_dist_dist [list ".08 .06"] set chamf_equal_dist [list ".08 "] if { [string compare $group dist_angle] == 0 } { - puts "TODO OCC22909 All:chamfer is not done. compute of chamfer failed" + puts "TODO OCC22909 All: compute of chamfer failed" } diff --git a/tests/de/end b/tests/de/end index d785088227..1cf95c93f8 100644 --- a/tests/de/end +++ b/tests/de/end @@ -104,27 +104,44 @@ if { $mist < 1} { set tps_1 [tpstat c] set colvo [llength $tps_1] if { ${colvo} > 0 } { - # Finding all strings with warnings - set a [regexp -all -inline {[\t ]+([-0-9.+eE]+)[\t ]+W:} $tps_1] - # Extracting counts of warnings - set b [regexp -all -inline {([-0-9.+eE]+)} $a] - # Calculating total number of warnings - foreach i $b {set war_First [expr $war_First + $i]} - set war_First [expr $war_First/4] + # Finding failed messages + set err_list [regexp -all -inline {[^\r\n:]*failed[^\r\n]*} $tps_1] + if { $err_list != 0 } { + foreach err_msg $err_list { + if { [regexp "\\(" $err_msg] } { + set err_msg [string map {\( \\\\(} $err_msg] + } + if { [regexp "\\)" $err_msg] } { + set err_msg [string map {\) \\\\)} $err_msg] + } + if { [regexp {transfer failed[^\r\n]*} $err_msg err_full_msg] } { + set err_msg "$err_full_msg" + } + if { ![regexp "$err_msg" $todo_msg] } { + append todo_msg $todo_mask $err_msg $end_line + } + } + } - # Finding all strings with faulties - set a [regexp -all -inline {[\t ]+([-0-9.+eE]+)[\t ]+F:} $tps_1] - # Extracting counts of faulties - set b [regexp -all -inline {([-0-9.+eE]+)} $a] - # Calculating total number of faulties - foreach i $b {set fal_First [expr $fal_First + $i]} - set fal_First [expr $fal_First/4] - # Calculating total number of faulties and warnings - set comp_First [expr $fal_First + $war_First] - + # Finding all strings with warnings + set a [regexp -all -inline {[\t ]+([-0-9.+eE]+)[\t ]+W:} $tps_1] + # Extracting counts of warnings + set b [regexp -all -inline {([-0-9.+eE]+)} $a] + # Calculating total number of warnings + foreach i $b {set war_First [expr $war_First + $i]} + set war_First [expr $war_First/4] + # Finding all strings with faulties + set a [regexp -all -inline {[\t ]+([-0-9.+eE]+)[\t ]+F:} $tps_1] + # Extracting counts of faulties + set b [regexp -all -inline {([-0-9.+eE]+)} $a] + # Calculating total number of faulties + foreach i $b {set fal_First [expr $fal_First + $i]} + set fal_First [expr $fal_First/4] + # Calculating total number of faulties and warnings + set comp_First [expr $fal_First + $war_First] } else { - puts " TPSTAT c checking was NOT provided" + puts " TPSTAT c checking was NOT provided" } # Get DECAF information about (color, layers and properties) @@ -288,27 +305,44 @@ if { $mist < 1} { set tps_1 [tpstat c] set colvo [llength $tps_1] if { ${colvo} > 0 } { - # Finding all strings with warnings - set a [regexp -all -inline {[\t ]+([-0-9.+eE]+)[\t ]+W:} $tps_1] - # Extracting counts of warnings - set b [regexp -all -inline {([-0-9.+eE]+)} $a] - # Calculating total number of warnings - foreach i $b {set war_Second [expr $war_Second + $i]} - set war_Second [expr $war_Second/4] + # Finding failed messages + set err_list [regexp -all -inline {[^\r\n:]*failed[^\r\n]*} $tps_1] + if { $err_list != 0 } { + foreach err_msg $err_list { + if { [regexp "\\(" $err_msg] } { + set err_msg [string map {\( \\\\(} $err_msg] + } + if { [regexp "\\)" $err_msg] } { + set err_msg [string map {\) \\\\)} $err_msg] + } + if { [regexp {transfer failed[^\r\n]*} $err_msg err_full_msg] } { + set err_msg "$err_full_msg" + } + if { ![regexp "$err_msg" $todo_msg] } { + append todo_msg $todo_mask $err_msg $end_line + } + } + } - # Finding all strings with faulties - set a [regexp -all -inline {[\t ]+([-0-9.+eE]+)[\t ]+F:} $tps_1] - # Extracting counts of faulties - set b [regexp -all -inline {([-0-9.+eE]+)} $a] - # Calculating total number of faulties - foreach i $b {set fal_Second [expr $fal_Second + $i]} - set fal_Second [expr $fal_Second/4] - # Calculating total number of faulties and warnings - set comp_Second [expr $fal_Second + $war_Second] - + # Finding all strings with warnings + set a [regexp -all -inline {[\t ]+([-0-9.+eE]+)[\t ]+W:} $tps_1] + # Extracting counts of warnings + set b [regexp -all -inline {([-0-9.+eE]+)} $a] + # Calculating total number of warnings + foreach i $b {set war_Second [expr $war_Second + $i]} + set war_Second [expr $war_Second/4] + # Finding all strings with faulties + set a [regexp -all -inline {[\t ]+([-0-9.+eE]+)[\t ]+F:} $tps_1] + # Extracting counts of faulties + set b [regexp -all -inline {([-0-9.+eE]+)} $a] + # Calculating total number of faulties + foreach i $b {set fal_Second [expr $fal_Second + $i]} + set fal_Second [expr $fal_Second/4] + # Calculating total number of faulties and warnings + set comp_Second [expr $fal_Second + $war_Second] } else { - puts " TPSTAT c checking was NOT provided" + puts " TPSTAT c checking was NOT provided" } # Get DECAF information about (color, layers and properties) diff --git a/tests/de/iges_1/B6 b/tests/de/iges_1/B6 index 1b87896554..591b876d6b 100644 --- a/tests/de/iges_1/B6 +++ b/tests/de/iges_1/B6 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: transfer failed : entity skipped." puts "TODO CR23096 ALL: TPSTAT : Faulty" diff --git a/tests/de/iges_1/J9 b/tests/de/iges_1/J9 index ce3d7bb641..0f7f879ee9 100644 --- a/tests/de/iges_1/J9 +++ b/tests/de/iges_1/J9 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: transfer failed : entity skipped." puts "TODO CR23096 ALL: TPSTAT : Faulty" diff --git a/tests/de/iges_2/D4 b/tests/de/iges_2/D4 index 2104ab9eca..1e74472351 100644 --- a/tests/de/iges_2/D4 +++ b/tests/de/iges_2/D4 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: transfer failed : entity skipped." puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" diff --git a/tests/de/step_1/D7 b/tests/de/step_1/D7 index 849156033f..1f7d37ad0c 100644 --- a/tests/de/step_1/D7 +++ b/tests/de/step_1/D7 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: TPSTAT : Faulty" diff --git a/tests/de/step_1/I1 b/tests/de/step_1/I1 index 730be639be..be6e8c694b 100644 --- a/tests/de/step_1/I1 +++ b/tests/de/step_1/I1 @@ -1,4 +1,7 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" + + set filename PRO7745.stp set ref_data { diff --git a/tests/de/step_1/J6 b/tests/de/step_1/J6 index f30c26dd3f..8ffaf33860 100755 --- a/tests/de/step_1/J6 +++ b/tests/de/step_1/J6 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" diff --git a/tests/de/step_1/O3 b/tests/de/step_1/O3 index 0eba113e5d..f1985e007a 100644 --- a/tests/de/step_1/O3 +++ b/tests/de/step_1/O3 @@ -1,4 +1,7 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" + + set filename cpe1.stp set ref_data { diff --git a/tests/de/step_1/R3 b/tests/de/step_1/R3 index a4c7363353..280a65d949 100644 --- a/tests/de/step_1/R3 +++ b/tests/de/step_1/R3 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: TPSTAT : Faulty" diff --git a/tests/de/step_1/S2 b/tests/de/step_1/S2 index b1d8795f6b..bb18377e81 100644 --- a/tests/de/step_1/S2 +++ b/tests/de/step_1/S2 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: TPSTAT : Faulty" diff --git a/tests/de/step_1/ZA7 b/tests/de/step_1/ZA7 index 8ff2c3741e..77d3d30469 100644 --- a/tests/de/step_1/ZA7 +++ b/tests/de/step_1/ZA7 @@ -1,4 +1,7 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" + + set filename war1.stp set ref_data { diff --git a/tests/de/step_2/E6 b/tests/de/step_2/E6 index 3b0631a8b7..24706c1582 100644 --- a/tests/de/step_2/E6 +++ b/tests/de/step_2/E6 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: TPSTAT : Faulty" puts "TODO CR23096 ALL: STATSHAPE : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" diff --git a/tests/de/step_2/E7 b/tests/de/step_2/E7 index b07d5d5e0b..54d8c4e4f1 100644 --- a/tests/de/step_2/E7 +++ b/tests/de/step_2/E7 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" diff --git a/tests/de/step_2/G2 b/tests/de/step_2/G2 index b50967a847..e3840f7f38 100644 --- a/tests/de/step_2/G2 +++ b/tests/de/step_2/G2 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: TPSTAT : Faulty" diff --git a/tests/de/step_2/G5 b/tests/de/step_2/G5 index 8ea589ef8a..7a9992189a 100644 --- a/tests/de/step_2/G5 +++ b/tests/de/step_2/G5 @@ -1,4 +1,6 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Make Geom_Curve \\(3D\\) failed" +puts "TODO CR23096 ALL: At least one edge failed : wire not done" puts "TODO CR23096 ALL: NBSHAPES : Faulty" diff --git a/tests/de/step_2/H2 b/tests/de/step_2/H2 index a757c95d81..deb391c19f 100644 --- a/tests/de/step_2/H2 +++ b/tests/de/step_2/H2 @@ -1,4 +1,7 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" + + set filename PRO7747.stp set ref_data { diff --git a/tests/de/step_2/M5 b/tests/de/step_2/M5 index 1d4baa1f6b..85de8334a4 100644 --- a/tests/de/step_2/M5 +++ b/tests/de/step_2/M5 @@ -1,4 +1,7 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" + + set filename coquille.stp set ref_data { diff --git a/tests/de/step_2/N6 b/tests/de/step_2/N6 index 08ead2d2aa..8ecf69c372 100644 --- a/tests/de/step_2/N6 +++ b/tests/de/step_2/N6 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: TPSTAT : Faulty" diff --git a/tests/de/step_2/R5 b/tests/de/step_2/R5 index a8c5997310..724db7baa2 100644 --- a/tests/de/step_2/R5 +++ b/tests/de/step_2/R5 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: TPSTAT : Faulty" diff --git a/tests/de/step_3/A4 b/tests/de/step_3/A4 index fbcb11a9a1..31bc639357 100644 --- a/tests/de/step_3/A4 +++ b/tests/de/step_3/A4 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: TPSTAT : Faulty" diff --git a/tests/de/step_3/B9 b/tests/de/step_3/B9 index c6d329ceab..be419b1e27 100644 --- a/tests/de/step_3/B9 +++ b/tests/de/step_3/B9 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: STATSHAPE : Faulty" puts "TODO CR23096 ALL: TOLERANCE : Faulty" puts "TODO CR25013 ALL: Error : 3 differences with reference data found" diff --git a/tests/de/step_3/D9 b/tests/de/step_3/D9 index adb333147a..f16d3adf29 100755 --- a/tests/de/step_3/D9 +++ b/tests/de/step_3/D9 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" puts "TODO CR23096 ALL: NBSHAPES : Faulty" diff --git a/tests/de/step_3/E5 b/tests/de/step_3/E5 index bae0c9bd1f..d2bb44df29 100644 --- a/tests/de/step_3/E5 +++ b/tests/de/step_3/E5 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: TPSTAT : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" diff --git a/tests/de/step_3/E6 b/tests/de/step_3/E6 index cc25fb9749..4189a0a8a3 100755 --- a/tests/de/step_3/E6 +++ b/tests/de/step_3/E6 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" puts "TODO CR23096 ALL: STATSHAPE : Faulty" diff --git a/tests/de/step_4/A7 b/tests/de/step_4/A7 index e212b71ed6..45f372d885 100644 --- a/tests/de/step_4/A7 +++ b/tests/de/step_4/A7 @@ -1,4 +1,7 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" + + set filename CTS21491.stp set ref_data { diff --git a/tests/de/step_4/B2 b/tests/de/step_4/B2 index da1a86f240..8372ffed91 100644 --- a/tests/de/step_4/B2 +++ b/tests/de/step_4/B2 @@ -1,4 +1,7 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" + + set filename PRO10377.stp set ref_data { diff --git a/tests/de/step_4/B3 b/tests/de/step_4/B3 index 6385a5e170..52fcb8d91d 100644 --- a/tests/de/step_4/B3 +++ b/tests/de/step_4/B3 @@ -1,4 +1,5 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" puts "TODO CR23096 ALL: NBSHAPES : Faulty" puts "TODO CR23096 ALL: TPSTAT : Faulty" diff --git a/tests/de/step_4/B4 b/tests/de/step_4/B4 index cffe1eeca8..8fee071c17 100644 --- a/tests/de/step_4/B4 +++ b/tests/de/step_4/B4 @@ -1,4 +1,7 @@ # !!!! This file is generated automatically, do not edit manually! See end script +puts "TODO CR23096 ALL: Update of 3D-Parameters has failed" + + set filename PRO7656.stp set ref_data { diff --git a/tests/heal/data/advanced/F1 b/tests/heal/data/advanced/F1 index 9ee7e1b6a9..be4f22886d 100644 --- a/tests/heal/data/advanced/F1 +++ b/tests/heal/data/advanced/F1 @@ -1,8 +1,10 @@ if {[string compare $command "ShapeDivide"] == 0 } { + puts "TODO OCC23127 ALL: Status: FAIL2" puts "TODO OCC23127 ALL: Error: 12 Curve Only C0 after DT_ShapeDivide operation." } if {[string compare $command "SplitAngle"] == 0 } { - puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2 " + puts "TODO OCC23127 ALL: Status: FAIL2" + puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2" } restore [locate_data_file ma-test9.rle] a diff --git a/tests/heal/data/advanced/F2 b/tests/heal/data/advanced/F2 index ad10aaf487..e37ddff8f1 100644 --- a/tests/heal/data/advanced/F2 +++ b/tests/heal/data/advanced/F2 @@ -1,8 +1,9 @@ if {[string compare $command "ShapeConvertRev"] == 0 } { - puts "TODO OCC23127 ALL: Error : The area of the resulting shape is " + puts "TODO OCC23127 ALL: Error : The area of the resulting shape is" } if {[string compare $command "SplitAngle"] == 0 } { - puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2 " + puts "TODO OCC23127 ALL: Status: FAIL2" + puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2" } restore [locate_data_file ma-test10.rle] a diff --git a/tests/heal/data/advanced/F3 b/tests/heal/data/advanced/F3 index 397e9dca6b..58d281d6bc 100644 --- a/tests/heal/data/advanced/F3 +++ b/tests/heal/data/advanced/F3 @@ -2,10 +2,12 @@ if { [string compare $command "ShapeConvertRev"] == 0 } { puts "TODO OCC23127 ALL: Error : The area of the resulting shape is" } if {[string compare $command "ShapeDivide"] == 0 } { + puts "TODO OCC23127 ALL: Status: FAIL2" puts "TODO OCC23127 ALL: Error: 12 Curve Only C0 after DT_ShapeDivide operation." } if {[string compare $command "SplitAngle"] == 0 } { - puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2 " + puts "TODO OCC23127 ALL: Status: FAIL2" + puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2" } restore [locate_data_file ma-test11.rle] a diff --git a/tests/mesh/data/standard/O5 b/tests/mesh/data/standard/O5 index 2f8bb1ae06..615220393f 100755 --- a/tests/mesh/data/standard/O5 +++ b/tests/mesh/data/standard/O5 @@ -8,3 +8,6 @@ if { [string compare $command "shading"] == 0 } { } else { set rel_tol 0.21 } +if { [string compare $command "incmesh"] == 0 } { + puts "TODO OCC22687 ALL: Meshing statuses: Failure" +} \ No newline at end of file diff --git a/tests/mesh/data/standard/U4 b/tests/mesh/data/standard/U4 index 81aa844171..cf125b840e 100755 --- a/tests/mesh/data/standard/U4 +++ b/tests/mesh/data/standard/U4 @@ -8,4 +8,6 @@ if { [string compare $command "shading"] == 0 } { set bug_withouttri "OCC23105" set nbwithouttri(All) 1 } - +if { [string compare $command "incmesh"] == 0 } { + puts "TODO OCC22687 ALL: Meshing statuses: Failure" +} diff --git a/tests/mesh/data/standard/V6 b/tests/mesh/data/standard/V6 index ea128e71a7..81b5d57234 100755 --- a/tests/mesh/data/standard/V6 +++ b/tests/mesh/data/standard/V6 @@ -1,3 +1,6 @@ set TheFileName shading_wrongshape_017.brep set bug_withouttri "OCC22687" set nbwithouttri(All) 1 +if { [string compare $command "incmesh"] == 0 } { + puts "TODO OCC22687 ALL: Meshing statuses: Failure" +} diff --git a/tests/parse.rules b/tests/parse.rules index 452c6d184e..32b0a5c2d9 100644 --- a/tests/parse.rules +++ b/tests/parse.rules @@ -3,4 +3,7 @@ IGNORE /Tcl Exception: [*][*] Exception [*][*]/ duplicate report on exception on IGNORE /Relative error of mass computation :/ diagnostic message of *props* commands FAILED /\b[Ee]xception\b/ exception FAILED /\b[Ee][Rr][Rr][Oo][Rr]\b/ error +FAILED /\b[Ff][Aa][Ii][Ll][0-9]\b/ error +FAILED /\b[Ff][Aa][Ii][Ll][Ee][Dd]\b/ error +FAILED /\b[Ff][Aa][Ii][Ll][Uu][Rr][Ee]\b/ error FAILED /Process killed by CPU limit/ Killed by CPU limit diff --git a/tests/perf/modalg/bug10160_1 b/tests/perf/modalg/bug10160_1 index 61f148be11..b9f72c3680 100644 --- a/tests/perf/modalg/bug10160_1 +++ b/tests/perf/modalg/bug10160_1 @@ -1,3 +1,4 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" puts "TODO OCC11111 ALL: Error : is WRONG because number of " puts "============" diff --git a/tests/perf/modalg/bug10160_2 b/tests/perf/modalg/bug10160_2 index 065231de5a..14ddc06314 100644 --- a/tests/perf/modalg/bug10160_2 +++ b/tests/perf/modalg/bug10160_2 @@ -1,3 +1,4 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" puts "TODO OCC11111 ALL: Error : is WRONG because number of " puts "============" diff --git a/tests/perf/modalg/bug10160_3 b/tests/perf/modalg/bug10160_3 index 48c8b18830..5bc662d1fd 100644 --- a/tests/perf/modalg/bug10160_3 +++ b/tests/perf/modalg/bug10160_3 @@ -1,4 +1,6 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" puts "TODO OCC11111 ALL: Error : is WRONG because number of " + puts "============" puts "OCC10160" puts "============" diff --git a/tests/perf/modalg/bug10160_4 b/tests/perf/modalg/bug10160_4 index 152cf3553d..c269aa052d 100644 --- a/tests/perf/modalg/bug10160_4 +++ b/tests/perf/modalg/bug10160_4 @@ -1,4 +1,6 @@ +puts "TODO CR29596 ALL: Warning: Intersection of pair of shapes has failed" puts "TODO OCC11111 ALL: Error : is WRONG because number of " + puts "============" puts "OCC10160" puts "============"