From d9e8bb0884ce1aca256ec00b29f470853dece143 Mon Sep 17 00:00:00 2001 From: dbv Date: Mon, 15 Apr 2013 13:57:08 +0400 Subject: [PATCH] Updating test cases for 23828 issue to mark them as known on Mac OS X platform. --- src/DrawResources/TestCommands.tcl | 4 +++- tests/boolean/bopfuse_complex/E5 | 3 +++ tests/bugs/modalg_4/bug62 | 15 +++++++++++++-- tests/bugs/vis/bug288_6 | 3 +++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/DrawResources/TestCommands.tcl b/src/DrawResources/TestCommands.tcl index f924833381..b6d4f07aa9 100644 --- a/src/DrawResources/TestCommands.tcl +++ b/src/DrawResources/TestCommands.tcl @@ -1517,7 +1517,7 @@ proc _tests_platform_def {} { # use detailed mapping for various versions of Lunix # (note that mapping is rather non-uniform, for historical reasons) - if { $env(os_type) == "unix" && ! [catch {exec cat /etc/issue} issue] } { + if { $tcl_platform(os) == "Linux" && ! [catch {exec cat /etc/issue} issue] } { if { [regexp {Mandriva[ \tA-Za-z]+([0-9]+)} $issue res num] } { set env(os_type) Mandriva$num } elseif { [regexp {Red Hat[ \tA-Za-z]+([0-9]+)} $issue res num] } { @@ -1534,6 +1534,8 @@ proc _tests_platform_def {} { if { [exec uname -m] == "x86_64" } { set env(os_type) "$env(os_type)-64" } + } elseif { $tcl_platform(os) == "Darwin" } { + set env(os_type) MacOS } } _tests_platform_def diff --git a/tests/boolean/bopfuse_complex/E5 b/tests/boolean/bopfuse_complex/E5 index a4dc4b76b6..77ee7c535d 100644 --- a/tests/boolean/bopfuse_complex/E5 +++ b/tests/boolean/bopfuse_complex/E5 @@ -1,3 +1,6 @@ +puts "TODO #23828 MacOS: Tcl Exception: null shapes are not allowed" +puts "TODO #23828 MacOS: TEST INCOMPLETE" + restore [locate_data_file OCC62.brep] sh explode sh diff --git a/tests/bugs/modalg_4/bug62 b/tests/bugs/modalg_4/bug62 index f8cb4e9718..fd9c32a43d 100755 --- a/tests/bugs/modalg_4/bug62 +++ b/tests/bugs/modalg_4/bug62 @@ -1,5 +1,16 @@ -puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" -puts "TODO OCC12345 ALL: Error : The square of result shape is" +set os "ALL" + +if {[array get env os_type] != ""} { + set os $env(os_type) +} + +if {[string compare $os "MacOS"] == 0} { + puts "TODO #23828 MacOS: Tcl Exception: sh is not a topological shape!!!" + puts "TODO #23828 MacOS: TEST INCOMPLETE" +} else { + puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_" + puts "TODO OCC12345 ALL: Error : The square of result shape is" +} puts "================" puts "OCC62" diff --git a/tests/bugs/vis/bug288_6 b/tests/bugs/vis/bug288_6 index 6161bd23a2..ccf0cfc56f 100755 --- a/tests/bugs/vis/bug288_6 +++ b/tests/bugs/vis/bug288_6 @@ -2,6 +2,9 @@ puts "================" puts "OCC288" puts "================" puts "" +puts "TODO #23828 MacOS: Tcl Exception: result is not a topological shape!!!" +puts "TODO #23828 MacOS: TEST INCOMPLETE" + ####################################################################################### # Currently meshing (for shading) of some shapes looks incorrect ######################################################################################