From: vtn Date: Mon, 23 Jul 2012 11:53:47 +0000 (+0400) Subject: 0023342: Changing of OCCT tests according to integration of 23.07.2012 X-Git-Tag: V6_5_4_beta1~110 X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=be10f7a868602537d2914ba1486af0b906b98ea5 0023342: Changing of OCCT tests according to integration of 23.07.2012 Tests are changed according to current state of OCCT. --- diff --git a/tests/boolean/bfuse_complex/Q3 b/tests/boolean/bfuse_complex/Q3 index 9fbe98974d..31076c5869 100644 --- a/tests/boolean/bfuse_complex/Q3 +++ b/tests/boolean/bfuse_complex/Q3 @@ -41,7 +41,8 @@ regexp {CPU user time: ([0-9|.]+) seconds} [dchrono k show] full Kseconds regexp {CPU user time: ([0-9|.]+) seconds} [dchrono l show] full Lseconds regexp {CPU user time: ([0-9|.]+) seconds} [dchrono m show] full Mseconds -set Jtime [expr $Jseconds * 1.1] +#sometimes CPU user time may be 0 +set Jtime [expr ($Jseconds * 1.1) + 0.2] set Ktime $Kseconds set Ltime $Lseconds set Mtime $Mseconds diff --git a/tests/boolean/bsection/R6 b/tests/boolean/bsection/R6 index fca3932e1f..14fa82b134 100644 --- a/tests/boolean/bsection/R6 +++ b/tests/boolean/bsection/R6 @@ -41,7 +41,8 @@ regexp {CPU user time: ([0-9|.]+) seconds} [dchrono k show] full Kseconds regexp {CPU user time: ([0-9|.]+) seconds} [dchrono l show] full Lseconds regexp {CPU user time: ([0-9|.]+) seconds} [dchrono m show] full Mseconds -set Jtime [expr $Jseconds * 1.1] +#sometimes CPU user time may be 0 +set Jtime [expr ($Jseconds * 1.1) + 0.2] set Ktime $Kseconds set Ltime $Lseconds set Mtime $Mseconds diff --git a/tests/draft/angle/M3 b/tests/draft/angle/M3 index 234eb71465..cd9347c1fe 100644 --- a/tests/draft/angle/M3 +++ b/tests/draft/angle/M3 @@ -1,11 +1,6 @@ # Original bug : cts21900 # Date : 02 Dec 98 -puts "TODO OCC22803 All:An exception was caught" -puts "TODO OCC22803 All:\\*\\* Exception \\*\\*" -puts "TODO OCC22803 All:Error in depouille" -puts "TODO OCC22803 All:Error : The depouille can not be build" - restore [locate_data_file cts21900_base.brep] base explode base face @@ -13,4 +8,4 @@ explode base face if { [catch { depouille result base 0 0 1 base_16 3 200 -15.1180845742047 30 0 0 1 base_18 3 200 -15.1180845742047 30 0 0 1 } ] != 0 } { puts "Error in depouille" } -set square 0 +set square 74960.8 diff --git a/tests/mesh/data/standard/G1 b/tests/mesh/data/standard/G1 index 40433d332b..c76c1289ed 100755 --- a/tests/mesh/data/standard/G1 +++ b/tests/mesh/data/standard/G1 @@ -36,7 +36,7 @@ if { [string compare $command "mesh"] == 0 } { set nb 56 } if {[string compare $os "Debian40"] == 0} { - set nb 61 + set nb {51|61} } } set bug_cross "OCC22687"