From f49c31097cdb00916ec54918a20546dfb343d25f Mon Sep 17 00:00:00 2001 From: apn Date: Tue, 17 Jun 2014 17:18:18 +0400 Subject: [PATCH] Modified CPU limit in test cases inDebug mode. --- tests/boolean/bcut_complex/P6 | 2 ++ tests/boolean/bsection/M8 | 2 ++ tests/boolean/bsection/N4 | 2 +- tests/bugs/modalg_5/bug23706_10 | 2 ++ tests/bugs/modalg_5/bug23706_13 | 2 ++ tests/bugs/modalg_5/bug23958 | 2 ++ tests/bugs/modalg_5/bug24157_1 | 7 ++++++- tests/bugs/modalg_5/bug24157_2 | 7 ++++++- tests/bugs/modalg_5/bug24157_3 | 7 ++++++- tests/bugs/modalg_5/bug24157_4 | 7 ++++++- tests/bugs/modalg_5/bug24157_5 | 8 ++++++-- tests/bugs/modalg_5/bug24157_6 | 7 ++++++- tests/bugs/modalg_5/bug24157_7 | 7 ++++++- tests/bugs/modalg_5/bug24157_8 | 7 ++++++- tests/bugs/modalg_5/bug24157_9 | 7 ++++++- tests/bugs/modalg_5/bug24190 | 2 +- tests/bugs/modalg_5/bug24758_2 | 2 +- 17 files changed, 67 insertions(+), 13 deletions(-) diff --git a/tests/boolean/bcut_complex/P6 b/tests/boolean/bcut_complex/P6 index f8bdcc4e02..afc84c7831 100644 --- a/tests/boolean/bcut_complex/P6 +++ b/tests/boolean/bcut_complex/P6 @@ -2,6 +2,8 @@ puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_" puts "TODO #22911 ALL: Error : The area of the resulting shape is" +cpulimit 1500 + restore [locate_data_file CTO909_Bug3_Tr_obj.rle] a restore [locate_data_file Bug4_Tr_outil.rle] b diff --git a/tests/boolean/bsection/M8 b/tests/boolean/bsection/M8 index 614264a2c9..eb5797be5e 100644 --- a/tests/boolean/bsection/M8 +++ b/tests/boolean/bsection/M8 @@ -1,3 +1,5 @@ +cpulimit 1500 + restore [locate_data_file lh3d_px1.brep] a #removing intersection of faces a_3 and a_220 diff --git a/tests/boolean/bsection/N4 b/tests/boolean/bsection/N4 index af8d0ff6a2..529abd5f0c 100644 --- a/tests/boolean/bsection/N4 +++ b/tests/boolean/bsection/N4 @@ -1,6 +1,6 @@ #puts "TODO #23749 ALL: Faulty shapes in variables faulty_1 to faulty_" -cpulimit 4000 +cpulimit 4500 restore [locate_data_file lh3d_px2.brep] a compound result diff --git a/tests/bugs/modalg_5/bug23706_10 b/tests/bugs/modalg_5/bug23706_10 index 3f1e0ecd1e..9c72dac056 100755 --- a/tests/bugs/modalg_5/bug23706_10 +++ b/tests/bugs/modalg_5/bug23706_10 @@ -6,6 +6,8 @@ puts "" # Cannot project point on curve ######################################################################### +cpulimit 1500 + bsplinecurve r3 2 6 1 3 2 1 3 1 4 1 5 1 6 3 2 5 3 1 3 7 3 1 4 8 3 1 4 8 3 1 4 8 3 1 5 9 3 1 9 7 3 1 bsplinecurve r4 2 6 2 3 2.5 1 3 1 3.5 1 4 1 4.5 3 -1 2 3 1 1 11 3 1 3 9 3 1 3 9 3 1 3 9 3 1 5 7 3 1 7 4 3 1 extrema r3 r4 diff --git a/tests/bugs/modalg_5/bug23706_13 b/tests/bugs/modalg_5/bug23706_13 index 0ba9d96038..c311042e51 100755 --- a/tests/bugs/modalg_5/bug23706_13 +++ b/tests/bugs/modalg_5/bug23706_13 @@ -6,6 +6,8 @@ puts "" # Cannot project point on curve ######################################################################### +cpulimit 1500 + 2dbsplinecurve b3 2 6 1 3 2 1 3 1 4 1 5 1 6 3 2 5 1 3 7 1 4 8 1 4 8 1 4 8 1 5 9 1 9 7 1 2dbsplinecurve b4 2 6 2 3 2.5 1 3 1 3.5 1 4 1 4.5 3 -1 2 1 1 11 1 3 9 1 3 9 1 3 9 1 5 7 1 7 4 1 diff --git a/tests/bugs/modalg_5/bug23958 b/tests/bugs/modalg_5/bug23958 index 81e720c7b2..078d291a3c 100644 --- a/tests/bugs/modalg_5/bug23958 +++ b/tests/bugs/modalg_5/bug23958 @@ -6,6 +6,8 @@ puts "" # Section of shell by plane is incomplete ################################################################################# +cpulimit 2000 + pload DATAEXCHANGEKERNEL # shell diff --git a/tests/bugs/modalg_5/bug24157_1 b/tests/bugs/modalg_5/bug24157_1 index fa8c894b14..89dc24c803 100644 --- a/tests/bugs/modalg_5/bug24157_1 +++ b/tests/bugs/modalg_5/bug24157_1 @@ -17,7 +17,12 @@ bfillds regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time -if { $tps_time > 60 } { +if { [regexp {Debug mode} [dversion]] } { + set check_time 110 +} else { + set check_time 87 +} +if { $tps_time > $check_time } { puts "Error: low performance" } else { puts "OK: high performance" diff --git a/tests/bugs/modalg_5/bug24157_2 b/tests/bugs/modalg_5/bug24157_2 index 0972f60e21..7424534fb9 100644 --- a/tests/bugs/modalg_5/bug24157_2 +++ b/tests/bugs/modalg_5/bug24157_2 @@ -20,7 +20,12 @@ bfillds regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time -if { $tps_time > 200 } { +if { [regexp {Debug mode} [dversion]] } { + set check_time 460 +} else { + set check_time 378 +} +if { $tps_time > $check_time } { puts "Error: low performance" } else { puts "OK: high performance" diff --git a/tests/bugs/modalg_5/bug24157_3 b/tests/bugs/modalg_5/bug24157_3 index 82f85a9ed9..a436ded6e8 100644 --- a/tests/bugs/modalg_5/bug24157_3 +++ b/tests/bugs/modalg_5/bug24157_3 @@ -14,7 +14,12 @@ bfillds regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time -if { $tps_time > 15 } { +if { [regexp {Debug mode} [dversion]] } { + set check_time 30 +} else { + set check_time 16 +} +if { $tps_time > $check_time } { puts "Error: low performance" } else { puts "OK: high performance" diff --git a/tests/bugs/modalg_5/bug24157_4 b/tests/bugs/modalg_5/bug24157_4 index c2bf875b94..ffb8d27aea 100644 --- a/tests/bugs/modalg_5/bug24157_4 +++ b/tests/bugs/modalg_5/bug24157_4 @@ -59,7 +59,12 @@ bfillds regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time -if { $tps_time > 30 } { +if { [regexp {Debug mode} [dversion]] } { + set check_time 30 +} else { + set check_time 43 +} +if { $tps_time > $check_time } { puts "Error: low performance" } else { puts "OK: high performance" diff --git a/tests/bugs/modalg_5/bug24157_5 b/tests/bugs/modalg_5/bug24157_5 index f2f76de5e8..4a634c9fac 100644 --- a/tests/bugs/modalg_5/bug24157_5 +++ b/tests/bugs/modalg_5/bug24157_5 @@ -63,10 +63,14 @@ baddobjects b1 baddcompound b2 bfillds -bbuild result -t regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time -if { $tps_time > 100 } { +if { [regexp {Debug mode} [dversion]] } { + set check_time 30 +} else { + set check_time 913 +} +if { $tps_time > $check_time } { puts "Error: low performance" } else { puts "OK: high performance" diff --git a/tests/bugs/modalg_5/bug24157_6 b/tests/bugs/modalg_5/bug24157_6 index 4ec968f899..c01606fa46 100644 --- a/tests/bugs/modalg_5/bug24157_6 +++ b/tests/bugs/modalg_5/bug24157_6 @@ -43,7 +43,12 @@ bfillds regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time -if { $tps_time > 10 } { +if { [regexp {Debug mode} [dversion]] } { + set check_time 20 +} else { + set check_time 24 +} +if { $tps_time > $check_time } { puts "Error: low performance" } else { puts "OK: high performance" diff --git a/tests/bugs/modalg_5/bug24157_7 b/tests/bugs/modalg_5/bug24157_7 index 9dd6cd992a..eed8879a54 100644 --- a/tests/bugs/modalg_5/bug24157_7 +++ b/tests/bugs/modalg_5/bug24157_7 @@ -43,7 +43,12 @@ bfillds regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time -if { $tps_time > 100 } { +if { [regexp {Debug mode} [dversion]] } { + set check_time 90 +} else { + set check_time 135 +} +if { $tps_time > $check_time } { puts "Error: low performance" } else { puts "OK: high performance" diff --git a/tests/bugs/modalg_5/bug24157_8 b/tests/bugs/modalg_5/bug24157_8 index 2f7e25af0a..cec9bf70ae 100644 --- a/tests/bugs/modalg_5/bug24157_8 +++ b/tests/bugs/modalg_5/bug24157_8 @@ -44,7 +44,12 @@ bfillds -t regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time -if { $tps_time > 9.5 } { +if { [regexp {Debug mode} [dversion]] } { + set check_time 25 +} else { + set check_time 2.2 +} +if { $tps_time > $check_time } { puts "Error: low performance" } else { puts "OK: high performance" diff --git a/tests/bugs/modalg_5/bug24157_9 b/tests/bugs/modalg_5/bug24157_9 index c83d8e6ec0..cf5d81bb21 100644 --- a/tests/bugs/modalg_5/bug24157_9 +++ b/tests/bugs/modalg_5/bug24157_9 @@ -24,7 +24,12 @@ bfillds regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time -if { $tps_time > 85.7 } { +if { [regexp {Debug mode} [dversion]] } { + set check_time 220 +} else { + set check_time 16 +} +if { $tps_time > $check_time } { puts "Error: low performance" } else { puts "OK: high performance" diff --git a/tests/bugs/modalg_5/bug24190 b/tests/bugs/modalg_5/bug24190 index d6dedf2609..6ffef9814f 100755 --- a/tests/bugs/modalg_5/bug24190 +++ b/tests/bugs/modalg_5/bug24190 @@ -6,7 +6,7 @@ puts "" # Exception raised during topological operation. ####################################################################### -cpulimit 2500 +cpulimit 4000 restore [locate_data_file bug24190_itz.brep] b diff --git a/tests/bugs/modalg_5/bug24758_2 b/tests/bugs/modalg_5/bug24758_2 index 9135df994e..463512e674 100644 --- a/tests/bugs/modalg_5/bug24758_2 +++ b/tests/bugs/modalg_5/bug24758_2 @@ -7,7 +7,7 @@ puts "" ############################################################## if { [regexp {Debug mode} [dversion]] } { - cpulimit 2000 + cpulimit 3000 } # drill parameters (some terms taken from http://www.drill-bits.cn/drill-bits-quality.asp) -- 2.20.1