From aad4bc1f7be8b87ecf4302a10cefc60e54799f95 Mon Sep 17 00:00:00 2001 From: apn Date: Thu, 14 May 2015 17:33:55 +0300 Subject: [PATCH] 0026192: Porting testing database on Debian70 64bit Modified test cases for platform Debian70 64bit Changed todo mapping for Debian70-64 --- src/DrawResources/TestCommands.tcl | 2 ++ tests/3rdparty/export/A1 | 7 +++- tests/boolean/gdml_private/B5 | 4 +-- tests/boolean/gdml_private/F8 | 2 +- tests/boolean/gdml_private/G1 | 8 ++--- tests/boolean/gdml_private/G7 | 2 +- tests/boolean/gdml_private/J4 | 2 +- tests/boolean/gdml_private/K8 | 4 +-- tests/boolean/gdml_private/L3 | 8 ++--- tests/boolean/gdml_private/L4 | 2 +- tests/boolean/gdml_private/L5 | 8 ++--- tests/boolean/gdml_private/W2 | 4 +-- tests/boolean/gdml_private/ZE4 | 6 ++-- tests/boolean/gdml_private/ZK3 | 12 +++---- tests/boolean/volumemaker/A4 | 2 +- tests/boolean/volumemaker/A7 | 2 +- tests/boolean/volumemaker/B3 | 4 +-- tests/boolean/volumemaker/B4 | 2 +- tests/boolean/volumemaker/B6 | 2 +- tests/boolean/volumemaker/B9 | 2 +- tests/boolean/volumemaker/C1 | 4 +-- tests/boolean/volumemaker/C3 | 4 +-- tests/boolean/volumemaker/C9 | 4 +-- tests/boolean/volumemaker/D2 | 2 +- tests/boolean/volumemaker/D4 | 2 +- tests/boolean/volumemaker/D5 | 2 +- tests/boolean/volumemaker/D8 | 4 +-- tests/boolean/volumemaker/F1 | 4 +-- tests/bugs/caf/bug1138 | 6 ++-- tests/bugs/fclasses/bug63 | 4 +-- tests/bugs/fclasses/bug7287_2 | 4 +-- tests/bugs/fclasses/bug7287_3 | 4 +-- tests/bugs/fclasses/bug7287_4 | 4 +-- tests/bugs/fclasses/bug7287_5 | 4 +-- tests/bugs/fclasses/bug7287_6 | 4 +-- tests/bugs/modalg_5/bug24074 | 6 ++-- tests/bugs/modalg_5/bug25199 | 16 ++++++--- tests/bugs/moddata_2/bug567 | 2 +- tests/bugs/vis/bug24374 | 6 ++-- tests/bugs/vis/bug24389 | 44 +++++++++++------------ tests/chamfer/data/complex/B9 | 2 +- tests/de/step_3/F3 | 2 +- tests/draft/angle/G8 | 4 +-- tests/draft/angle/M2 | 2 +- tests/mesh/data/standard/U7 | 2 +- tests/mesh/data/standard/W4 | 2 +- tests/offset/wire_closed_inside_0_005/H6 | 4 +-- tests/offset/wire_closed_inside_0_025/H6 | 4 +-- tests/offset/wire_closed_inside_0_075/H6 | 4 +-- tests/offset/wire_closed_outside_0_005/H6 | 4 +-- tests/offset/wire_closed_outside_0_025/H6 | 4 +-- tests/offset/wire_closed_outside_0_075/H6 | 4 +-- tests/perf/ncollection/A1 | 4 +-- 53 files changed, 135 insertions(+), 122 deletions(-) diff --git a/src/DrawResources/TestCommands.tcl b/src/DrawResources/TestCommands.tcl index 3d316342f8..5e24abc41c 100644 --- a/src/DrawResources/TestCommands.tcl +++ b/src/DrawResources/TestCommands.tcl @@ -1669,6 +1669,8 @@ proc _tests_platform_def {} { set env(os_type) RedHat$num } elseif { [regexp {Debian[ \tA-Za-z/]+([0-9]+)[.]([0-9]+)} $issue res num subnum] } { set env(os_type) Debian$num$subnum + } elseif { [regexp {Debian[ \tA-Za-z/]+([0-9]+)} $issue res num] } { + set env(os_type) Debian${num}0 } elseif { [regexp {CentOS[ \tA-Za-z]+([0-9]+)[.]([0-9]+)} $issue res num subnum] } { set env(os_type) CentOS$num$subnum } elseif { [regexp {Scientific[ \tA-Za-z]+([0-9]+)[.]([0-9]+)} $issue res num subnum] } { diff --git a/tests/3rdparty/export/A1 b/tests/3rdparty/export/A1 index eed738654d..a74e924225 100755 --- a/tests/3rdparty/export/A1 +++ b/tests/3rdparty/export/A1 @@ -18,4 +18,9 @@ set aFile $imagedir/shape.pdf set format PDF -set size 154489 + +if { [string compare $tcl_platform(platform) "windows"] != 0 } { + set size 144401 +} else { + set size 154489 +} diff --git a/tests/boolean/gdml_private/B5 b/tests/boolean/gdml_private/B5 index 561ad439a1..4dd96d4c10 100644 --- a/tests/boolean/gdml_private/B5 +++ b/tests/boolean/gdml_private/B5 @@ -1,8 +1,8 @@ # ? - because sometimes test is killed by elapsed time puts "TODO OCC26018 ALL: TEST INCOMPLETE" puts "TODO ?OCC26018 ALL: Process killed by CPU limit" -puts "TODO ?OCC26017 Debian60-64: \\*\\* Exception" -puts "TODO ?OCC26017 Debian60-64: An exception was caught" +puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception" +puts "TODO ?OCC26017 Debian70-64: An exception was caught" puts "TODO ?OCC26017 ALL: Tcl Exception:" puts "TODO ?OCC26017 ALL: Error: sh141385A0_copy is not a valid shape" puts "TODO ?OCC26017 ALL Error: sh59D36470_copy is not a valid shape" diff --git a/tests/boolean/gdml_private/F8 b/tests/boolean/gdml_private/F8 index f8f8e2e7b5..cb909311e1 100644 --- a/tests/boolean/gdml_private/F8 +++ b/tests/boolean/gdml_private/F8 @@ -1,5 +1,5 @@ puts "TODO OCC26018 ALL: Error : The area of the resulting shape is" -puts "TODO OCC26018 Debian60-64: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO OCC26018 Debian70-64: Faulty shapes in variables faulty_1 to faulty_" puts "TODO ?OCC26017 Windows: Faulty shapes in variables faulty_1 to faulty_" source [locate_data_file 20000_et1_401-ta6027.prt.2.gdml.tcl] diff --git a/tests/boolean/gdml_private/G1 b/tests/boolean/gdml_private/G1 index 7813ab3072..8ae3d9c647 100644 --- a/tests/boolean/gdml_private/G1 +++ b/tests/boolean/gdml_private/G1 @@ -1,7 +1,7 @@ -puts "TODO ?OCC26017 Debian60-64: \\*\\* Exception" -puts "TODO ?OCC26017 Debian60-64: An exception was caught" +puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception" +puts "TODO ?OCC26017 Debian70-64: An exception was caught" puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO ?OCC26017 Debian60-64: Process killed by CPU limit" -puts "TODO ?OCC26017 Debian60-64: TEST INCOMPLETE" +puts "TODO ?OCC26017 Debian70-64: Process killed by CPU limit" +puts "TODO ?OCC26017 Debian70-64: TEST INCOMPLETE" source [locate_data_file 20000_et1_401-ta6029.prt.2.gdml.tcl] diff --git a/tests/boolean/gdml_private/G7 b/tests/boolean/gdml_private/G7 index f6e0357b8a..4f174e3402 100644 --- a/tests/boolean/gdml_private/G7 +++ b/tests/boolean/gdml_private/G7 @@ -1,5 +1,5 @@ puts "TODO OCC26018 ALL: Error : The area of the resulting shape is" -puts "TODO OCC26018 Debian60-64: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO OCC26018 Debian70-64: Faulty shapes in variables faulty_1 to faulty_" source [locate_data_file 20000_et3_401-ta6037.prt.2.gdml.tcl] ## image is differ from application diff --git a/tests/boolean/gdml_private/J4 b/tests/boolean/gdml_private/J4 index c5f412ecbd..bd6ae6456a 100644 --- a/tests/boolean/gdml_private/J4 +++ b/tests/boolean/gdml_private/J4 @@ -1,4 +1,4 @@ puts "TODO OCC26018 Windows: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO ?OCC26017 Debian60-64: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO ?OCC26017 Debian70-64: Faulty shapes in variables faulty_1 to faulty_" source [locate_data_file 20000_et5_401-ta6160.prt.2.gdml.tcl] diff --git a/tests/boolean/gdml_private/K8 b/tests/boolean/gdml_private/K8 index f51af520d1..84e2107219 100644 --- a/tests/boolean/gdml_private/K8 +++ b/tests/boolean/gdml_private/K8 @@ -1,7 +1,7 @@ # ? - because sometimes test is killed by elapsed time -puts "TODO ?OCC26017 Debian60-64: \\*\\* Exception" -puts "TODO ?OCC26017 Debian60-64: An exception was caught" +puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception" +puts "TODO ?OCC26017 Debian70-64: An exception was caught" puts "TODO ?OCC26017 ALL: TEST INCOMPLETE" puts "TODO ?OCC26017 ALL: Process killed by CPU limit" puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_" diff --git a/tests/boolean/gdml_private/L3 b/tests/boolean/gdml_private/L3 index 1e0fa70f6b..94dd71572a 100644 --- a/tests/boolean/gdml_private/L3 +++ b/tests/boolean/gdml_private/L3 @@ -1,7 +1,7 @@ puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO ?OCC26017 Debian60-64: \\*\\* Exception" -puts "TODO ?OCC26017 Debian60-64: An exception was caught" -puts "TODO ?OCC26017 Debian60-64: TEST INCOMPLETE" -puts "TODO ?OCC26017 Debian60-64: Process killed by CPU limit" +puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception" +puts "TODO ?OCC26017 Debian70-64: An exception was caught" +puts "TODO ?OCC26017 Debian70-64: TEST INCOMPLETE" +puts "TODO ?OCC26017 Debian70-64: Process killed by CPU limit" source [locate_data_file 20000_g1-2_et1.asm.5.gdml.tcl] diff --git a/tests/boolean/gdml_private/L4 b/tests/boolean/gdml_private/L4 index eba22ad56c..dad93ba810 100644 --- a/tests/boolean/gdml_private/L4 +++ b/tests/boolean/gdml_private/L4 @@ -1,5 +1,5 @@ puts "TODO OCC26018 ALL: Error : The area of the resulting shape is" -puts "TODO OCC26018 Debian60-64: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO OCC26018 Debian70-64: Faulty shapes in variables faulty_1 to faulty_" source [locate_data_file 20000_g1-2_et3.asm.2.gdml.tcl] ## image is differ from application diff --git a/tests/boolean/gdml_private/L5 b/tests/boolean/gdml_private/L5 index 5c40b78157..d6fe0aad8f 100644 --- a/tests/boolean/gdml_private/L5 +++ b/tests/boolean/gdml_private/L5 @@ -1,7 +1,7 @@ puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO ?OCC26017 Debian60-64: XIO: fatal IO error" -puts "TODO ?OCC26017 Debian60-64: TEST INCOMPLETE" -puts "TODO ?OCC26017 Debian60-64: Tcl Exception" -puts "TODO ?OCC26017 Debian60-64: Error: shC26D310_copy is not a valid shape" +puts "TODO ?OCC26017 Debian70-64: XIO: fatal IO error" +puts "TODO ?OCC26017 Debian70-64: TEST INCOMPLETE" +puts "TODO ?OCC26017 Debian70-64: Tcl Exception" +puts "TODO ?OCC26017 Debian70-64: Error: shC26D310_copy is not a valid shape" source [locate_data_file 20000_g1-2_et4.asm.3.gdml.tcl] diff --git a/tests/boolean/gdml_private/W2 b/tests/boolean/gdml_private/W2 index 0c02f2c91a..ceda2b076c 100644 --- a/tests/boolean/gdml_private/W2 +++ b/tests/boolean/gdml_private/W2 @@ -1,6 +1,6 @@ puts "TODO ?OCC26017 ALL: TEST INCOMPLETE" -puts "TODO ?OCC26017 Debian60-64: \\*\\* Exception" -puts "TODO ?OCC26017 Debian60-64: An exception was caught" +puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception" +puts "TODO ?OCC26017 Debian70-64: An exception was caught" puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_" source [locate_data_file 20000_ss2_401-ta5993.prt.2.gdml.tcl] diff --git a/tests/boolean/gdml_private/ZE4 b/tests/boolean/gdml_private/ZE4 index cec4ce677f..42ae5d16f0 100644 --- a/tests/boolean/gdml_private/ZE4 +++ b/tests/boolean/gdml_private/ZE4 @@ -1,5 +1,5 @@ -puts "TODO ?OCC26017 Debian60-64: TEST INCOMPLETE" -puts "TODO ?OCC26017 Debian60-64: \\*\\* Exception" -puts "TODO ?OCC26017 Debian60-64: An exception was caught" +puts "TODO ?OCC26017 Debian70-64: TEST INCOMPLETE" +puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception" +puts "TODO ?OCC26017 Debian70-64: An exception was caught" source [locate_data_file 401-ta6001-3.prt.1.gdml.tcl] diff --git a/tests/boolean/gdml_private/ZK3 b/tests/boolean/gdml_private/ZK3 index aba4d7e219..dd4f047f9d 100644 --- a/tests/boolean/gdml_private/ZK3 +++ b/tests/boolean/gdml_private/ZK3 @@ -1,8 +1,8 @@ -puts "TODO ?OCC26017 Debian60-64: TEST INCOMPLETE" -puts "TODO ?OCC26017 Debian60-64: \\*\\* Exception" -puts "TODO ?OCC26017 Debian60-64: An exception was caught" -puts "TODO ?OCC26017 Debian60-64: X Error of failed request" -puts "TODO ?OCC26017 Debian60-64: XIO: fatal IO error 11" -puts "TODO ?OCC26017 Debian60-64: Process killed by CPU limit" +puts "TODO ?OCC26017 Debian70-64: TEST INCOMPLETE" +puts "TODO ?OCC26017 Debian70-64: \\*\\* Exception" +puts "TODO ?OCC26017 Debian70-64: An exception was caught" +puts "TODO ?OCC26017 Debian70-64: X Error of failed request" +puts "TODO ?OCC26017 Debian70-64: XIO: fatal IO error 11" +puts "TODO ?OCC26017 Debian70-64: Process killed by CPU limit" source [locate_data_file voile_3.asm.1.gdml.tcl] diff --git a/tests/boolean/volumemaker/A4 b/tests/boolean/volumemaker/A4 index efa08bd656..118058c429 100644 --- a/tests/boolean/volumemaker/A4 +++ b/tests/boolean/volumemaker/A4 @@ -3,7 +3,7 @@ puts "TODO ?OCC26019 ALL: Error: bopcheck failed" puts "TODO ?OCC26019 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO ?OCC26019 Debian60-64: Error : The area of the resulting shape is" +puts "TODO ?OCC26019 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 -2740.6595835899998 -150 -1050 1.110223024625157e-016 1 1.1102230246251563e-016 diff --git a/tests/boolean/volumemaker/A7 b/tests/boolean/volumemaker/A7 index 209422b4a5..881ae1dda1 100644 --- a/tests/boolean/volumemaker/A7 +++ b/tests/boolean/volumemaker/A7 @@ -3,7 +3,7 @@ puts "TODO ?OCC26019 ALL: Error: bopcheck failed" puts "TODO ?OCC26019 ALL: Error : The area of the resulting shape" -puts "TODO ?OCC26019 Debian60-64: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO ?OCC26019 Debian70-64: Faulty shapes in variables faulty_1 to faulty_" # planar face plane pln_f1 -1863.18155559 1250 -1538.57262704 1.110223024625157e-016 1 1.1102230246251563e-016 diff --git a/tests/boolean/volumemaker/B3 b/tests/boolean/volumemaker/B3 index 9b8aba8610..328ff5d399 100644 --- a/tests/boolean/volumemaker/B3 +++ b/tests/boolean/volumemaker/B3 @@ -2,8 +2,8 @@ # plane puts "TODO OCC26020 ALL: Error: bopcheck failed" -puts "TODO OCC26020 Debian60-64: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC26020 Debian60-64: Error : The area of the resulting shape is" +puts "TODO OCC26020 Debian70-64: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 590.6877421677151 -519.8775759738943 -93.555747452441423 0.64798185367609173 0.7547095802227719 -0.10263024323494339 diff --git a/tests/boolean/volumemaker/B4 b/tests/boolean/volumemaker/B4 index 303d974841..c4bc4f612b 100644 --- a/tests/boolean/volumemaker/B4 +++ b/tests/boolean/volumemaker/B4 @@ -3,7 +3,7 @@ puts "TODO OCC26020 ALL: Error: bopcheck failed" puts "TODO ?OCC26019 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC26020 Debian60-64: Error : The area of the resulting shape is" +puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 79.400363856921899 8.7220982904821555e-015 -94.116057183203139 -0.83335943573869897 -2.2204460492503131e-016 -0.55273144551877762 diff --git a/tests/boolean/volumemaker/B6 b/tests/boolean/volumemaker/B6 index f9e1a1f853..c5577ed9bd 100644 --- a/tests/boolean/volumemaker/B6 +++ b/tests/boolean/volumemaker/B6 @@ -3,7 +3,7 @@ puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" puts "TODO OCC26020 ALL: Error: bopcheck failed" -puts "TODO OCC26020 Debian60-64: Error : The area of the resulting shape is" +puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 35.877464033656999 5.9462928582193458e-016 -25.973690230789806 -0.64944804833018333 -3.0834627769631957e-016 -0.76040596560003137 diff --git a/tests/boolean/volumemaker/B9 b/tests/boolean/volumemaker/B9 index 9907cf1585..6c8156812a 100644 --- a/tests/boolean/volumemaker/B9 +++ b/tests/boolean/volumemaker/B9 @@ -3,7 +3,7 @@ puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" puts "TODO OCC26020 ALL: Error: bopcheck failed" -puts "TODO OCC26020 Debian60-64: Error : The area of the resulting shape is" +puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 32.294537607197917 1.8096910201742288e-014 -39.176406819310692 -0.77162458338772011 -6.6613381477509373e-016 -0.63607822027776384 diff --git a/tests/boolean/volumemaker/C1 b/tests/boolean/volumemaker/C1 index 16aa6b1c34..3f33cc5213 100644 --- a/tests/boolean/volumemaker/C1 +++ b/tests/boolean/volumemaker/C1 @@ -2,8 +2,8 @@ # plane puts "TODO OCC26020 Windows: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC26020 Debian60-64: Error : The area of the resulting shape is" -puts "TODO OCC26020 Debian60-64: Error: bopcheck failed" +puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is" +puts "TODO OCC26020 Debian70-64: Error: bopcheck failed" # planar face plane pln_f1 -331.49269816258993 -487.15663197846379 -460.05843051255943 -0.29784456643004237 0.75470958022277179 -0.58455287508322795 diff --git a/tests/boolean/volumemaker/C3 b/tests/boolean/volumemaker/C3 index 51bc392a19..dd45a213cb 100644 --- a/tests/boolean/volumemaker/C3 +++ b/tests/boolean/volumemaker/C3 @@ -2,8 +2,8 @@ # plane puts "TODO OCC26020 Windows: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC26020 Debian60-64: Error : The mkvolume is not valid. The area is" -puts "TODO OCC26020 Debian60-64: Error : The area of the resulting shape is" +puts "TODO OCC26020 Debian70-64: Error : The mkvolume is not valid. The area is" +puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 -513.57358775546049 376.87261141864394 391.24411461018769 -0.35888381816183362 -0.86162916044152549 0.35888381816183351 diff --git a/tests/boolean/volumemaker/C9 b/tests/boolean/volumemaker/C9 index c09e2926dd..fb8937e36b 100644 --- a/tests/boolean/volumemaker/C9 +++ b/tests/boolean/volumemaker/C9 @@ -2,8 +2,8 @@ # cylinder plane unstable puts "TODO ?OCC26019 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO ?OCC26019 Debian60-64: Error: bopcheck failed" -puts "TODO ?OCC26019 Debian60-64: Error : The area of the resulting shape is" +puts "TODO ?OCC26019 Debian70-64: Error: bopcheck failed" +puts "TODO ?OCC26019 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 0 -875 -1.4432899320127035e-014 0 1 1.1102230246251565e-016 diff --git a/tests/boolean/volumemaker/D2 b/tests/boolean/volumemaker/D2 index 8fa0be77e2..a89e87220d 100644 --- a/tests/boolean/volumemaker/D2 +++ b/tests/boolean/volumemaker/D2 @@ -3,7 +3,7 @@ puts "TODO ?OCC26019 ALL: Error: bopcheck failed" puts "TODO ?OCC26019 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO ?OCC26019 Debian60-64: Error : The area of the resulting shape is" +puts "TODO ?OCC26019 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 0 -232.5 3.8857805861880479e-015 0 -1 -1.1102230246251565e-016 diff --git a/tests/boolean/volumemaker/D4 b/tests/boolean/volumemaker/D4 index 0d7918aabf..f4c886fdfc 100644 --- a/tests/boolean/volumemaker/D4 +++ b/tests/boolean/volumemaker/D4 @@ -2,7 +2,7 @@ # cylinder plane puts "TODO OCC26020 ALL: Error: bopcheck failed" -puts "TODO OCC26020 Debian60-64: Error : The area of the resulting shape is" +puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 1665.7013364039071 -825 -339.75605834598957 0.15643446504023129 4.4408920985006257e-016 0.98768834059513766 diff --git a/tests/boolean/volumemaker/D5 b/tests/boolean/volumemaker/D5 index b3a6af6f5f..01af5f931c 100644 --- a/tests/boolean/volumemaker/D5 +++ b/tests/boolean/volumemaker/D5 @@ -2,7 +2,7 @@ # cylinder plane puts "TODO OCC26020 ALL: Error: bopcheck failed" -puts "TODO OCC26020 Debian60-64: Error : The area of the resulting shape is" +puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 0 -1450 -4.4408920985006262e-015 0 1 1.1102230246251565e-016 diff --git a/tests/boolean/volumemaker/D8 b/tests/boolean/volumemaker/D8 index 28f83a4ceb..696a344941 100644 --- a/tests/boolean/volumemaker/D8 +++ b/tests/boolean/volumemaker/D8 @@ -2,8 +2,8 @@ # cylinder plane puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC26020 Debian60-64: Error: bopcheck failed" -puts "TODO OCC26020 Debian60-64: Error : The area of the resulting shape is" +puts "TODO OCC26020 Debian70-64: Error: bopcheck failed" +puts "TODO OCC26020 Debian70-64: Error : The area of the resulting shape is" # planar face plane pln_f1 -335.23319463083521 698.25 1031.741684575172 0.95105651629515375 3.3306690738754676e-016 0.30901699437494723 diff --git a/tests/boolean/volumemaker/F1 b/tests/boolean/volumemaker/F1 index c2bc6b2730..e1f05d610c 100644 --- a/tests/boolean/volumemaker/F1 +++ b/tests/boolean/volumemaker/F1 @@ -4,8 +4,8 @@ puts "TODO OCC26020 Windows: Error status" puts "TODO OCC26020 Windows: TEST INCOMPLETE" -puts "TODO OCC26020 Debian60-64: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO ?OCC26019 Debian60-64: Error: bopcheck failed" +puts "TODO OCC26020 Debian70-64: Faulty shapes in variables faulty_1 to faulty_" +puts "TODO ?OCC26019 Debian70-64: Error: bopcheck failed" # planar face plane pln_f1 -2.4595121467478056e-014 -746.52181700999995 1844.22896887 0.86602540378443849 -0.47367733686073094 -0.16009303715192033 diff --git a/tests/bugs/caf/bug1138 b/tests/bugs/caf/bug1138 index d418dce2a8..b142b58185 100755 --- a/tests/bugs/caf/bug1138 +++ b/tests/bugs/caf/bug1138 @@ -1,6 +1,6 @@ -puts "TODO OCC12345 Debian60-64: An exception was caught" -puts "TODO OCC12345 Debian60-64: Faulty OCC1138 : here is reading problem when the filename is a directory name." -puts "TODO OCC12345 Debian60-64: Faulty OCC1138" +puts "TODO ?OCC12345 Debian70-64: An exception was caught" +puts "TODO ?OCC12345 Debian70-64: Faulty OCC1138 : here is reading problem when the filename is a directory name." +puts "TODO ?OCC12345 Debian70-64: Faulty OCC1138" puts "================" puts "OCC1138" diff --git a/tests/bugs/fclasses/bug63 b/tests/bugs/fclasses/bug63 index 757646eafb..068309dcd9 100755 --- a/tests/bugs/fclasses/bug63 +++ b/tests/bugs/fclasses/bug63 @@ -1,5 +1,5 @@ -puts "TODO OCC23626 Debian60-64 Windows: Tcl Exception" -puts "TODO OCC23626 Debian60-64 Windows: TEST INCOMPLETE" +puts "TODO OCC23626 Debian70-64 Windows: Tcl Exception" +puts "TODO OCC23626 Debian70-64 Windows: TEST INCOMPLETE" puts "================" puts "OCC63" diff --git a/tests/bugs/fclasses/bug7287_2 b/tests/bugs/fclasses/bug7287_2 index 7b012fe11e..e652c98f0b 100755 --- a/tests/bugs/fclasses/bug7287_2 +++ b/tests/bugs/fclasses/bug7287_2 @@ -1,5 +1,5 @@ -puts "TODO ?OCC25921 Debian60-64: Tcl Exception: Memory leak detected" -puts "TODO ?OCC25921 Debian60-64: TEST INCOMPLETE" +puts "TODO ?OCC25921 Debian70-64: Tcl Exception: Memory leak detected" +puts "TODO ?OCC25921 Debian70-64: TEST INCOMPLETE" puts "============" puts "OCC7287" diff --git a/tests/bugs/fclasses/bug7287_3 b/tests/bugs/fclasses/bug7287_3 index 4169b31cdd..fd2b43cfc7 100755 --- a/tests/bugs/fclasses/bug7287_3 +++ b/tests/bugs/fclasses/bug7287_3 @@ -1,5 +1,5 @@ -puts "TODO ?OCC25921 Debian60-64: Tcl Exception: Memory leak detected" -puts "TODO ?OCC25921 Debian60-64: TEST INCOMPLETE" +puts "TODO ?OCC25921 Debian70-64: Tcl Exception: Memory leak detected" +puts "TODO ?OCC25921 Debian70-64: TEST INCOMPLETE" puts "============" puts "OCC7287" diff --git a/tests/bugs/fclasses/bug7287_4 b/tests/bugs/fclasses/bug7287_4 index 84a845172e..9083edc170 100755 --- a/tests/bugs/fclasses/bug7287_4 +++ b/tests/bugs/fclasses/bug7287_4 @@ -1,5 +1,5 @@ -puts "TODO ?OCC25921 Debian60-64: Tcl Exception: Memory leak detected" -puts "TODO ?OCC25921 Debian60-64: TEST INCOMPLETE" +puts "TODO ?OCC25921 Debian70-64: Tcl Exception: Memory leak detected" +puts "TODO ?OCC25921 Debian70-64: TEST INCOMPLETE" puts "============" puts "OCC7287" diff --git a/tests/bugs/fclasses/bug7287_5 b/tests/bugs/fclasses/bug7287_5 index ece7bf3574..0bd8886210 100755 --- a/tests/bugs/fclasses/bug7287_5 +++ b/tests/bugs/fclasses/bug7287_5 @@ -1,5 +1,5 @@ -puts "TODO ?OCC25921 Debian60-64: Tcl Exception: Memory leak detected" -puts "TODO ?OCC25921 Debian60-64: TEST INCOMPLETE" +puts "TODO ?OCC25921 Debian70-64: Tcl Exception: Memory leak detected" +puts "TODO ?OCC25921 Debian70-64: TEST INCOMPLETE" puts "============" diff --git a/tests/bugs/fclasses/bug7287_6 b/tests/bugs/fclasses/bug7287_6 index 3b017e457a..4b92c8703b 100755 --- a/tests/bugs/fclasses/bug7287_6 +++ b/tests/bugs/fclasses/bug7287_6 @@ -1,5 +1,5 @@ -puts "TODO ?OCC25921 Debian60-64: Tcl Exception: Memory leak detected" -puts "TODO ?OCC25921 Debian60-64: TEST INCOMPLETE" +puts "TODO ?OCC25921 Debian70-64: Tcl Exception: Memory leak detected" +puts "TODO ?OCC25921 Debian70-64: TEST INCOMPLETE" puts "============" puts "OCC7287" diff --git a/tests/bugs/modalg_5/bug24074 b/tests/bugs/modalg_5/bug24074 index 11b12564f8..d7f72f4566 100644 --- a/tests/bugs/modalg_5/bug24074 +++ b/tests/bugs/modalg_5/bug24074 @@ -1,6 +1,6 @@ -#puts "TODO OCC24074 Debian60-64 Windows: An exception was caught" -puts "TODO OCC24074 Debian60-64 Windows: Error: Offset is not done" -puts "TODO OCC24074 Debian60-64 Windows: TEST INCOMPLETE" +#puts "TODO OCC24074 ALL: An exception was caught" +puts "TODO OCC24074 ALL: Error: Offset is not done" +puts "TODO OCC24074 ALL: TEST INCOMPLETE" puts "============" puts "OCC24074" diff --git a/tests/bugs/modalg_5/bug25199 b/tests/bugs/modalg_5/bug25199 index e5b9e21c9d..8e17b3ea41 100755 --- a/tests/bugs/modalg_5/bug25199 +++ b/tests/bugs/modalg_5/bug25199 @@ -6,16 +6,20 @@ puts "" # Bad tolerance edge generated by blend algorithm ############################################################################################### -decho off -test bugs modalg_3 bug615 -decho on +restore [locate_data_file OCC615.brep] a +checkshape a +explode a e + +if [catch {blend result a 9 a_15 } catch_result] { + puts "Faulty OCC615: function BLEND works with exception" +} else { + puts "OCC615 OK: function CHAMF works OK" +} explode result E - regexp {Tolerance +MAX=([-0-9.+eE]+)} [tolerance result_21] full MaxTol_1 puts "MaxTolerance = $MaxTol_1" - set MaxTol 0.001 if { $MaxTol_1 > $MaxTol } { @@ -24,3 +28,5 @@ if { $MaxTol_1 > $MaxTol } { puts "OCC25199 OK: Good tolerance edge generated by blend algorithm" } +set square 197055. +set 2dviewer 0 diff --git a/tests/bugs/moddata_2/bug567 b/tests/bugs/moddata_2/bug567 index d424603b98..8d15f3b14a 100755 --- a/tests/bugs/moddata_2/bug567 +++ b/tests/bugs/moddata_2/bug567 @@ -1,5 +1,5 @@ puts "TODO OCC12345 ALL: Faulty OCC565: function intersection works wrongly with trimmed Surfaces" -puts "TODO OCC12345 Debian60-64 MacOS: Faulty OCC565: function intersection works wrongly with infinite Surfaces" +puts "TODO OCC12345 Debian70-64 MacOS: Faulty OCC565: function intersection works wrongly with infinite Surfaces" puts "========" puts "OCC567" diff --git a/tests/bugs/vis/bug24374 b/tests/bugs/vis/bug24374 index 4e3e6fd5af..746a6e8902 100644 --- a/tests/bugs/vis/bug24374 +++ b/tests/bugs/vis/bug24374 @@ -13,10 +13,10 @@ vdimension dim1 -length -shapes b_9 -text 3d -plane zox vselmode b 2 1 vselmode dim1 2 1 vfit -vmoveto 140 370 +vmoveto 130 352 -set x_coord 140 -set y_coord 370 +set x_coord 130 +set y_coord 352 checkcolor $x_coord $y_coord 0 1 1 if { $stat != 1 } { diff --git a/tests/bugs/vis/bug24389 b/tests/bugs/vis/bug24389 index eaa670ffa4..c6be927cb7 100644 --- a/tests/bugs/vis/bug24389 +++ b/tests/bugs/vis/bug24389 @@ -156,68 +156,68 @@ proc check_cross_picking { pick object name } { # pick coord { [flyout], dimension line, text } # check sensitives "len1" -set pick_coord { { 99 133 } { 106 124 } { 76 131 } } -set check_coord { 125 124 } +set pick_coord { {100 133 } { 106 124 } { 76 130 } } +set check_coord { 123 125 } check_picking $pick_coord $check_coord "length dimension (len1)" check_cross_picking $pick_coord len1 "length dimension (len1)" # check sensitives "len2" -set pick_coord { { 99 167 } { 127 176 } { 185 183 } } -set check_coord { 112 176 } +set pick_coord { { 100 167 } { 126 177 } { 187 180 } } +set check_coord { 106 177 } check_picking $pick_coord $check_coord "length dimension (len2)" check_cross_picking $pick_coord len2 "length dimension (len2)" # check sensitives "len3" -set pick_coord { { 99 114 } { 110 98 } { 131 105 } } -set check_coord { 152 109 } +set pick_coord { { 100 114 } { 106 99 } { 120 97 } } +set check_coord { 153 109 } check_picking $pick_coord $check_coord "length dimension (len3)" check_cross_picking $pick_coord len3 "length dimension (len3)" # check sensitives "diam1" -set pick_coord { { 247 150 } { 194 157 } } -set check_coord { 236 150 } +set pick_coord { { 247 151 } { 184 150 } } +set check_coord { 236 151 } check_picking $pick_coord $check_coord "diameter dimension (diam1)" check_cross_picking $pick_coord diam1 "diameter dimension (diam1)" # check sensitives "diam2" -set pick_coord { { 221 98 } { 305 105 } } -set check_coord { 238 98 } +set pick_coord { { 221 99 } { 285 99 } } +set check_coord { 239 99 } check_picking $pick_coord $check_coord "diameter dimension (diam2)" check_cross_picking $pick_coord diam2 "diameter dimension (diam2)" # check sensitives "diam3" -set pick_coord { { 204 225 } { 268 242 } { 243 249 } } -set check_coord { 204 233 } +set pick_coord { { 205 225 } { 263 242 } { 224 242 } } +set check_coord { 205 233 } check_picking $pick_coord $check_coord "diameter dimension (diam3)" check_cross_picking $pick_coord diam3 "diameter dimension (diam3)" # check sensitives "rad1" -set pick_coord { { 287 157 } { 326 164 } } -set check_coord { 287 157 } +set pick_coord { { 288 158 } { 310 157 } } +set check_coord { 288 158 } check_picking $pick_coord $check_coord "radius dimension (rad1)" check_cross_picking $pick_coord rad1 "radius dimension (rad1)" # check sensitives "rad2" -set pick_coord { { 320 242 } { 383 249 } } -set check_coord { 340 242 } +set pick_coord { { 320 242 } { 362 241 } } +set check_coord { 320 242 } check_picking $pick_coord $check_coord "radius dimension (rad2)" check_cross_picking $pick_coord rad2 "radius dimension (rad2)" # check sensitives "ang1" -set pick_coord { { 112 268 } { 96 220 } { 80 250 } } -set check_coord { 96 220 } +set pick_coord { { 113 229 } { 96 221 } { 85 256 } } +set check_coord { 86 250 } check_picking $pick_coord $check_coord "angle dimension (ang1)" check_cross_picking $pick_coord ang1 "angle dimension (ang1)" # check sensitives "ang2" -set pick_coord { { 139 301 } { 152 327 } { 65 297 } } -set check_coord { 108 320 } +set pick_coord { { 140 311 } { 91 310 } { 50 278 } } +set check_coord { 105 318 } check_picking $pick_coord $check_coord "angle dimension (ang2)" check_cross_picking $pick_coord ang2 "angle dimension (ang2)" # check sensitives "ang3" -set pick_coord { { 171 304 } { 199 321 } { 252 285 } } -set check_coord { 191 324 } +set pick_coord { { 172 303 } { 163 327 } { 243 287 } } +set check_coord { 183 326 } check_picking $pick_coord $check_coord "angle dimension (ang3)" check_cross_picking $pick_coord ang3 "angle dimension (ang3)" diff --git a/tests/chamfer/data/complex/B9 b/tests/chamfer/data/complex/B9 index 6d3e9e970a..46607d5474 100644 --- a/tests/chamfer/data/complex/B9 +++ b/tests/chamfer/data/complex/B9 @@ -14,7 +14,7 @@ if { [string compare $command chamf_sequence] == 0 } { if { [string compare ${os} "Windows-64-VC9"] != 0 && [string compare ${os} "Windows-64-VC10"] != 0} { set nf 0 - if {[string compare $os "Debian60-64"] == 0 } { + if {[string compare $os "Debian70-64"] == 0 } { if { [string compare $group dist_dist] == 0 } { set nf 2 } elseif { [string compare $group equal_dist] == 0 } { diff --git a/tests/de/step_3/F3 b/tests/de/step_3/F3 index 261b49f24c..39ba6d70b2 100644 --- a/tests/de/step_3/F3 +++ b/tests/de/step_3/F3 @@ -1,6 +1,6 @@ # !!!! This file is generated automatically, do not edit manually! See end script puts "TODO CR23096 ALL: NBSHAPES : Faulty" -puts "TODO CR23096 Debian60-64: Error : 2 differences with reference data found :" +puts "TODO CR23096 Debian70-64: Error : 2 differences with reference data found :" set LinuxDiff 2 set filename trj12_b3-sy-214.stp diff --git a/tests/draft/angle/G8 b/tests/draft/angle/G8 index 663e8be13e..84383feefd 100644 --- a/tests/draft/angle/G8 +++ b/tests/draft/angle/G8 @@ -1,6 +1,6 @@ #F6---------------------------------------------- -puts "TODO OCC22803 Debian60-64: Error in depouille" -puts "TODO OCC22803 Debian60-64: Error : The skin cannot be built." +puts "TODO OCC22803 Debian70-64: Error in depouille" +puts "TODO OCC22803 Debian70-64: Error : The skin cannot be built." puts "TODO OCC22803 Windows: Faulty shapes in variables faulty_1 to faulty_" polyline p 0 0 3 0 0 0 10 0 0 10 0 3 beziercurve bc 4 10 0 3 7 0 2 3 0 3 0 0 3 diff --git a/tests/draft/angle/M2 b/tests/draft/angle/M2 index 264566958f..5c041b642c 100644 --- a/tests/draft/angle/M2 +++ b/tests/draft/angle/M2 @@ -2,7 +2,7 @@ # Date : 02 Dec 98 puts "TODO OCC22803 All: Error: The tolerance of the resulting shape is too big" -#puts "TODO OCC23511 Debian60-64: The area of the resulting shape is 186543" +#puts "TODO OCC23511 Debian70-64: The area of the resulting shape is 186543" restore [locate_data_file CFE903_pro12ggx.rle] base diff --git a/tests/mesh/data/standard/U7 b/tests/mesh/data/standard/U7 index e0afaf760a..cc72be0b46 100755 --- a/tests/mesh/data/standard/U7 +++ b/tests/mesh/data/standard/U7 @@ -14,7 +14,7 @@ if { [string compare $command "shading"] == 0 } { set nbn 83 if { [string compare $os "Mandriva2008"] == 0 - || [string compare $os "Debian60-64"] == 0 + || [string compare $os "Debian70-64"] == 0 } { ### set nbl 19 ### set nbfree($os) $nbl diff --git a/tests/mesh/data/standard/W4 b/tests/mesh/data/standard/W4 index aee1bcae77..5cfbcf24ed 100755 --- a/tests/mesh/data/standard/W4 +++ b/tests/mesh/data/standard/W4 @@ -23,7 +23,7 @@ if { [string compare $command "shading"] == 0 } { ### set os $env(os_type) ### } ### set bug_freelinks "OCC22687" -### if {[string compare $os "Mandriva2008"] == 0 || [string compare $os "MacOS"] == 0 || [string compare $os "Mandriva2010"] == 0 || [string compare $os "Debian40"] == 0 || [string compare $os "Debian60-64"] == 0 || [string compare $os "windows"] == 0} { +### if {[string compare $os "Mandriva2008"] == 0 || [string compare $os "MacOS"] == 0 || [string compare $os "Mandriva2010"] == 0 || [string compare $os "Debian40"] == 0 || [string compare $os "Debian70-64"] == 0 || [string compare $os "windows"] == 0} { ### set nb 4 ### } else { ### set nb 6 diff --git a/tests/offset/wire_closed_inside_0_005/H6 b/tests/offset/wire_closed_inside_0_005/H6 index 95e58d4f4f..f7745dbcb9 100644 --- a/tests/offset/wire_closed_inside_0_005/H6 +++ b/tests/offset/wire_closed_inside_0_005/H6 @@ -1,7 +1,7 @@ puts "TODO OCC23748 ALL: Error : The offset cannot be built." puts "TODO OCC23748 Windows: Error: Offset is not done." -puts "TODO OCC23748 Debian60-64: An exception was caught" -puts "TODO OCC23748 Debian60-64: \\*\\* Exception \\*\\*" +puts "TODO OCC23748 Debian70-64: An exception was caught" +puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*" restore [locate_data_file offset_wire_092.brep] s diff --git a/tests/offset/wire_closed_inside_0_025/H6 b/tests/offset/wire_closed_inside_0_025/H6 index 95e58d4f4f..f7745dbcb9 100644 --- a/tests/offset/wire_closed_inside_0_025/H6 +++ b/tests/offset/wire_closed_inside_0_025/H6 @@ -1,7 +1,7 @@ puts "TODO OCC23748 ALL: Error : The offset cannot be built." puts "TODO OCC23748 Windows: Error: Offset is not done." -puts "TODO OCC23748 Debian60-64: An exception was caught" -puts "TODO OCC23748 Debian60-64: \\*\\* Exception \\*\\*" +puts "TODO OCC23748 Debian70-64: An exception was caught" +puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*" restore [locate_data_file offset_wire_092.brep] s diff --git a/tests/offset/wire_closed_inside_0_075/H6 b/tests/offset/wire_closed_inside_0_075/H6 index 95e58d4f4f..f7745dbcb9 100644 --- a/tests/offset/wire_closed_inside_0_075/H6 +++ b/tests/offset/wire_closed_inside_0_075/H6 @@ -1,7 +1,7 @@ puts "TODO OCC23748 ALL: Error : The offset cannot be built." puts "TODO OCC23748 Windows: Error: Offset is not done." -puts "TODO OCC23748 Debian60-64: An exception was caught" -puts "TODO OCC23748 Debian60-64: \\*\\* Exception \\*\\*" +puts "TODO OCC23748 Debian70-64: An exception was caught" +puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*" restore [locate_data_file offset_wire_092.brep] s diff --git a/tests/offset/wire_closed_outside_0_005/H6 b/tests/offset/wire_closed_outside_0_005/H6 index 95e58d4f4f..f7745dbcb9 100644 --- a/tests/offset/wire_closed_outside_0_005/H6 +++ b/tests/offset/wire_closed_outside_0_005/H6 @@ -1,7 +1,7 @@ puts "TODO OCC23748 ALL: Error : The offset cannot be built." puts "TODO OCC23748 Windows: Error: Offset is not done." -puts "TODO OCC23748 Debian60-64: An exception was caught" -puts "TODO OCC23748 Debian60-64: \\*\\* Exception \\*\\*" +puts "TODO OCC23748 Debian70-64: An exception was caught" +puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*" restore [locate_data_file offset_wire_092.brep] s diff --git a/tests/offset/wire_closed_outside_0_025/H6 b/tests/offset/wire_closed_outside_0_025/H6 index 95e58d4f4f..f7745dbcb9 100644 --- a/tests/offset/wire_closed_outside_0_025/H6 +++ b/tests/offset/wire_closed_outside_0_025/H6 @@ -1,7 +1,7 @@ puts "TODO OCC23748 ALL: Error : The offset cannot be built." puts "TODO OCC23748 Windows: Error: Offset is not done." -puts "TODO OCC23748 Debian60-64: An exception was caught" -puts "TODO OCC23748 Debian60-64: \\*\\* Exception \\*\\*" +puts "TODO OCC23748 Debian70-64: An exception was caught" +puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*" restore [locate_data_file offset_wire_092.brep] s diff --git a/tests/offset/wire_closed_outside_0_075/H6 b/tests/offset/wire_closed_outside_0_075/H6 index 95e58d4f4f..f7745dbcb9 100644 --- a/tests/offset/wire_closed_outside_0_075/H6 +++ b/tests/offset/wire_closed_outside_0_075/H6 @@ -1,7 +1,7 @@ puts "TODO OCC23748 ALL: Error : The offset cannot be built." puts "TODO OCC23748 Windows: Error: Offset is not done." -puts "TODO OCC23748 Debian60-64: An exception was caught" -puts "TODO OCC23748 Debian60-64: \\*\\* Exception \\*\\*" +puts "TODO OCC23748 Debian70-64: An exception was caught" +puts "TODO OCC23748 Debian70-64: \\*\\* Exception \\*\\*" restore [locate_data_file offset_wire_092.brep] s diff --git a/tests/perf/ncollection/A1 b/tests/perf/ncollection/A1 index e9b130730b..be52775f80 100644 --- a/tests/perf/ncollection/A1 +++ b/tests/perf/ncollection/A1 @@ -19,9 +19,9 @@ lappend values "$diff_cl" if { [string compare $tcl_platform(platform) "windows"] != 0 } { set check_values { 1.2363286058767904 - 1.9537414143534 + 2.7537414143534 1.2596260162601621 - 2.8737043746844462 + 3.937043746844462 1.2133020329576465 1.2164522569168656 1.2495457282327385