From 429a6c4d2cda596e29214802ade992675279c91e Mon Sep 17 00:00:00 2001 From: mkv Date: Fri, 25 Oct 2013 13:55:18 +0400 Subject: [PATCH] Adjusting test unstable testing cases in Debug mode for current state of OCCT --- tests/boolean/bsection/M8 | 4 ++-- tests/boolean/bsection/M9 | 4 ++-- tests/boolean/bsection/N4 | 7 ++++--- tests/perf/bop/boxholes | 15 ++++++++------- tests/perf/bspline/intersect | 6 ++++++ 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/tests/boolean/bsection/M8 b/tests/boolean/bsection/M8 index eb10e53788..db92b82ebe 100644 --- a/tests/boolean/bsection/M8 +++ b/tests/boolean/bsection/M8 @@ -1,5 +1,5 @@ -puts "TODO DEBUG_OCC24121 Debian60-64: Process killed by CPU limit" -puts "TODO DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE" +#puts "TODO DEBUG_OCC24121 Debian60-64: Process killed by CPU limit" +#puts "TODO DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE" restore [locate_data_file lh3d_px1.brep] a diff --git a/tests/boolean/bsection/M9 b/tests/boolean/bsection/M9 index aec758eedd..4b297381a6 100644 --- a/tests/boolean/bsection/M9 +++ b/tests/boolean/bsection/M9 @@ -1,5 +1,5 @@ -puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Process killed by CPU limit" -puts "TODO DEBUG_OCC24121 Debian60-64 Windows: TEST INCOMPLETE" +#puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Process killed by CPU limit" +#puts "TODO DEBUG_OCC24121 Debian60-64 Windows: TEST INCOMPLETE" restore [locate_data_file lh3d_px1.brep] a diff --git a/tests/boolean/bsection/N4 b/tests/boolean/bsection/N4 index 2a3f961267..81e3d1aa6f 100644 --- a/tests/boolean/bsection/N4 +++ b/tests/boolean/bsection/N4 @@ -1,9 +1,10 @@ -puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Process killed by CPU limit" -puts "TODO DEBUG_OCC24121 Debian60-64 Windows: TEST INCOMPLETE" +#puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Process killed by CPU limit" +#puts "TODO DEBUG_OCC24121 Debian60-64 Windows: TEST INCOMPLETE" #puts "TODO #23749 ALL: Faulty shapes in variables faulty_1 to faulty_" -cpulimit 2000 +cpulimit 3500 + restore [locate_data_file lh3d_px2.brep] a compound result set i 1 diff --git a/tests/perf/bop/boxholes b/tests/perf/bop/boxholes index ae4cba0ddc..4b42a77712 100644 --- a/tests/perf/bop/boxholes +++ b/tests/perf/bop/boxholes @@ -10,6 +10,14 @@ puts "" # http://www.opencascade.org/org/forum/thread_12369/?forum=3 # in OCCT 6.6.0 32-bit mode on Windows this fails with N >= 40 (out of memory) +if { [regexp {Debug mode} [dversion]] } { + cpulimit 2000 + set max_time 1500 +} else { + cpulimit 500 + set max_time 250 +} + # box plate to cut the holes from box b 100 100 1 @@ -53,13 +61,6 @@ if { [expr ${mem2} - ${mem1}] > ${mem_delta}} { } regexp {CPU user time: ([-0-9.+eE]+) seconds} ${q2} full z -if { [string compare $tcl_platform(platform) "windows"] == 0 } { - puts "OS = Windows NT" - set max_time 200 -} else { - puts "OS = Linux" - set max_time 250 -} if { ${z} > ${max_time} } { puts "Elapsed time is more than ${max_time} seconds - Faulty" } else { diff --git a/tests/perf/bspline/intersect b/tests/perf/bspline/intersect index ae9625a2cc..513fb1666a 100644 --- a/tests/perf/bspline/intersect +++ b/tests/perf/bspline/intersect @@ -1,5 +1,11 @@ # Test performance of intersection of several NURBS surfaces +if { [regexp {Debug mode} [dversion]] } { + cpulimit 1000 +} else { + cpulimit 500 +} + bsplinesurf surf1 \ 3 4 0 4 1 1 2 1 3 4 \ 3 4 0 4 1 1 2 1 3 4 \ -- 2.20.1