From 8dd21a0db92cc0f442b30ea66796d1412aa97ea8 Mon Sep 17 00:00:00 2001 From: bugmaster Date: Mon, 17 Jul 2017 22:29:42 +0300 Subject: [PATCH] Adjusting test cases for hardware of occt-jenkins-05 --- tests/bugs/modalg_6/bug26310_1 | 44 ----------------------- tests/bugs/modalg_6/bug26327 | 45 ------------------------ tests/bugs/modalg_6/bug26447 | 34 ------------------ tests/bugs/modalg_6/bug26567 | 39 --------------------- tests/bugs/modalg_6/bug26980 | 62 --------------------------------- tests/bugs/modalg_6/bug27021 | 47 ------------------------- tests/bugs/moddata_3/bug27048_2 | 28 --------------- tests/bugs/step/bug27570 | 27 -------------- tests/bugs/vis/bug5682 | 25 ------------- tests/demo/draw/getsource | 2 +- 10 files changed, 1 insertion(+), 352 deletions(-) delete mode 100644 tests/bugs/modalg_6/bug26310_1 delete mode 100755 tests/bugs/modalg_6/bug26327 delete mode 100644 tests/bugs/modalg_6/bug26447 delete mode 100644 tests/bugs/modalg_6/bug26567 delete mode 100644 tests/bugs/modalg_6/bug26980 delete mode 100644 tests/bugs/modalg_6/bug27021 delete mode 100644 tests/bugs/moddata_3/bug27048_2 delete mode 100644 tests/bugs/step/bug27570 delete mode 100755 tests/bugs/vis/bug5682 diff --git a/tests/bugs/modalg_6/bug26310_1 b/tests/bugs/modalg_6/bug26310_1 deleted file mode 100644 index 394cfad094..0000000000 --- a/tests/bugs/modalg_6/bug26310_1 +++ /dev/null @@ -1,44 +0,0 @@ -puts "========" -puts "OCC26310" -puts "========" -puts "" -################################################# -# Very slow boolean cut operations on cylinders -################################################# - -if { [regexp {Debug mode} [dversion]] } { - set max_time 0.3 -} else { - set max_time 0.15 -} - -set maxToler 1.5e-5 - -restore [locate_data_file OCC26310-b1.brep] b1 -restore [locate_data_file OCC26310-b2.brep] b2 - -explode b1 f -explode b2 f - -dchrono cr reset -dchrono cr start -set log1 [bopcurves b1_1 b2_1 -2d] -dchrono cr stop - -regexp {Tolerance Reached=+([-0-9.+eE]+)} ${log1} full Toler - -puts "TolReached = $Toler" - -if { $Toler > $maxToler } { - puts "Error: Tolerance is too big ($Toler > $maxToler)" -} - -set log2 [dchrono cr show] - -regexp {CPU user time: ([-0-9.+eE]+) seconds} $log2 full sec - -if { $sec > ${max_time} } { - puts "Error: CPU user time is more than ${max_time} seconds" -} else { - puts "OK: CPU user time is less than ${max_time} seconds" -} diff --git a/tests/bugs/modalg_6/bug26327 b/tests/bugs/modalg_6/bug26327 deleted file mode 100755 index 184fb5c9ca..0000000000 --- a/tests/bugs/modalg_6/bug26327 +++ /dev/null @@ -1,45 +0,0 @@ -puts "============" -puts "OCC24596" -puts "============" -puts "" -############################### -## Slow import of IGES data -############################### - -pload XDE - -if { [regexp {Debug mode} [dversion]] } { - if { [regexp {Windows} [dversion]] } { - set max_time 30 - } else { - set max_time 30 - } -} else { - if { [regexp {Windows} [dversion]] } { - set max_time 10 - } else { - set max_time 10 - } -} - -dchrono h reset -dchrono h start - -stepread [locate_data_file bug26327_fuse_input.stp] a * - -for {set i 2} {$i < 22} {incr i} { - puts "a_$i" - bfuse a_1 a_1 a_$i - } - -dchrono h stop -set q [dchrono h show] - -regexp {CPU user time: ([-0-9.+eE]+) seconds} $q full z -puts "$z" - -if { $z > ${max_time} } { - puts "Elapsed time of import of IGES data is more than ${max_time} seconds - Faulty" -} else { - puts "Elapsed time of import of IGES data is less than ${max_time} seconds - OK" -} diff --git a/tests/bugs/modalg_6/bug26447 b/tests/bugs/modalg_6/bug26447 deleted file mode 100644 index 34e49d3b6b..0000000000 --- a/tests/bugs/modalg_6/bug26447 +++ /dev/null @@ -1,34 +0,0 @@ -puts "============" -puts "OCC26447" -puts "============" -puts "" -############################################################## -# Performance degradation intersecting cylindrical surfaces -############################################################# - -cylinder c1 0 0 0 1 0 0 0 -1 0 100 -cylinder c2 0 0 0 0 1 0 1 0 0 100 -mkface f1 c1 -mkface f2 c2 - -dchrono cr reset -dchrono cr start - -for {set i 1} {$i <= 1000} {incr i} { - bopcurves f1 f2 -} - -dchrono cr stop -if { [checkplatform -windows] } { - set max_time 7.5 -} else { - set max_time 4.5 -} -set TimeList [dchrono cr show] -regexp {Elapsed time: [-0-9.+eE]+ Hours [-0-9.+eE]+ Minutes ([-0-9.+eE]+) Seconds} $TimeList full ElapsedTime_sec - -if { ${ElapsedTime_sec} > ${max_time} } { - puts "Error: Elapsed time of intersecting is more than ${max_time} seconds" -} else { - puts "OK: Elapsed time of intersecting is less than ${max_time} seconds" -} diff --git a/tests/bugs/modalg_6/bug26567 b/tests/bugs/modalg_6/bug26567 deleted file mode 100644 index 9e6e567589..0000000000 --- a/tests/bugs/modalg_6/bug26567 +++ /dev/null @@ -1,39 +0,0 @@ -puts "============" -puts "OCC26567" -puts "============" -puts "" -############################### -## Exception in Boolean intersection command -############################### - -cpulimit 1000 - -restore [locate_data_file Bug26567_c0.brep] b1 -restore [locate_data_file Bug26567_c1.brep] b2 -restore [locate_data_file Bug26567_c2.brep] b3 -restore [locate_data_file Bug26567_c3.brep] b4 - - -bclearobjects -bcleartools -baddobjects b1 b2 b3 b4 - -#Exception in bfillds -bfillds - -bbop result 4 - -set nbshapes_expected " -Number of shapes in shape - VERTEX : 19228 - EDGE : 31600 - WIRE : 0 - FACE : 0 - SHELL : 0 - SOLID : 0 - COMPSOLID : 0 - COMPOUND : 1 - SHAPE : 50829 -" -checknbshapes result -ref ${nbshapes_expected} -t -m "result obtained by Common operator" -checkview -display result -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/modalg_6/bug26980 b/tests/bugs/modalg_6/bug26980 deleted file mode 100644 index 9816fcb810..0000000000 --- a/tests/bugs/modalg_6/bug26980 +++ /dev/null @@ -1,62 +0,0 @@ -puts "========" -puts "OCC26980" -puts "========" -puts "" -################################# -# Intersection part of Boolean algorithm spends much system time and system memory -################################# - -set max_time 120 -set mem_max_wsetpeak 500000000 - - -bclearobjects; -bcleartools; - -restore [locate_data_file bug26980-cmp.brep] cmp - -puts [nbshapes cmp -t] - -eval baddobjects [explode cmp] - -dchrono cr reset -dchrono cr start - -bfillds -bbuild result - -dchrono cr stop - -set mem_wsetpeak [meminfo wsetpeak] - -if { ${mem_wsetpeak} > ${mem_max_wsetpeak}} { - puts "Error : there is memory problem (${mem_wsetpeak} MBytes has been allocated)" -} - -set chrono_info [dchrono cr show] -regexp {CPU user time: ([-0-9.+eE]+) seconds} $chrono_info full CPU_time -if { $CPU_time > ${max_time} } { - puts "CPU user time of Boolean operation is more than ${max_time} seconds - Error" -} else { - puts "CPU user time of Boolean operation is less than ${max_time} seconds - OK" -} - -set nbshapes_expected " - VERTEX : 365 - EDGE : 793 - WIRE : 531 - FACE : 531 - SHELL : 102 - SOLID : 101 - COMPSOLID : 0 - COMPOUND : 1 - SHAPE : 2424 -" - -checknbshapes result -ref ${nbshapes_expected} -t - -smallview -donly result -fit - -set 2dviewer 1 diff --git a/tests/bugs/modalg_6/bug27021 b/tests/bugs/modalg_6/bug27021 deleted file mode 100644 index 082a33dc76..0000000000 --- a/tests/bugs/modalg_6/bug27021 +++ /dev/null @@ -1,47 +0,0 @@ -puts "========" -puts "OCC27021" -puts "========" -puts "" -########################################################### -# TopExp::Vertices performance optimization -########################################################### - -pload QAcommands - -if { [regexp {Debug mode} [dversion]] } { - if { [regexp {Windows} [dversion]] } { - set max_time 8. - set max_time2 5. - } else { - set max_time 8. - set max_time2 5. - } -} else { - if { [regexp {Windows} [dversion]] } { - set max_time 8. - set max_time2 5. - } else { - set max_time 8. - set max_time2 5. - } -} - -restore [locate_data_file bug27021_shape.brep] f - -set log [OCC27021 f] - -regexp {Retrieving 100000000 vertices using approach A\)\.\.\.done in ([-0-9.+eE]+) seconds} ${log} full A_sec -regexp {Retrieving 100000000 vertices using approach B\)\.\.\.done in ([-0-9.+eE]+) seconds} ${log} full B_sec - - -if { ${A_sec} > ${max_time} } { - puts "Retrieving 100000000 vertices using approach A) is more than ${max_time} seconds - Faulty" -} else { - puts "Retrieving 100000000 vertices using approach A) is less than ${max_time} seconds - OK" -} - -if { ${B_sec} > ${max_time2} } { - puts "Retrieving 100000000 vertices using approach A) is more than ${max_time2} seconds - Faulty" -} else { - puts "Retrieving 100000000 vertices using approach A) is less than ${max_time2} seconds - OK" -} diff --git a/tests/bugs/moddata_3/bug27048_2 b/tests/bugs/moddata_3/bug27048_2 deleted file mode 100644 index 6a9840cfe0..0000000000 --- a/tests/bugs/moddata_3/bug27048_2 +++ /dev/null @@ -1,28 +0,0 @@ -puts "============" -puts "OCC27048" -puts "============" -puts "" -############################################################################ -# Recalculation of BSpline cache causes a performance problems -############################################################################ - -pload XSDRAW - -dchrono t reset -dchrono t start -testreadstep [locate_data_file bug27048.stp] result -dchrono t stop -set elapsed [dchrono t show] - -regexp {CPU user time: ([-0-9.+eE]+) seconds} $elapsed full cpu_time -set max_time 40 - -if { $cpu_time > ${max_time} } { - puts "Error: reading document Doc is too long (greater than ${max_time} sec)" -} else { - puts "OK: performance reading document Doc is suitable" -} - -smallview -fit -checkview -screenshot -2d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/step/bug27570 b/tests/bugs/step/bug27570 deleted file mode 100644 index 1ce0febca4..0000000000 --- a/tests/bugs/step/bug27570 +++ /dev/null @@ -1,27 +0,0 @@ -puts "========" -puts "OCC27570" -puts "========" -puts "" -########################################################### -# Unacceptable performance during reading large STEP files -########################################################### - -set max_time 8 - -dchrono cr reset -dchrono cr start -ReadStep D [locate_data_file bug27570.stp] -dchrono cr stop - -# check time -set chrono_info [dchrono cr show] -regexp {CPU user time: ([-0-9.+eE]+) seconds} $chrono_info full CPU_time -if { $CPU_time > ${max_time} } { - puts "CPU user time of STEP translation is more than ${max_time} seconds - Error" -} else { - puts "CPU user time of STEP translation is less than ${max_time} seconds - OK" -} - -# check number of shapes -XGetOneShape result D -checknbshapes result -solid 1000 -compound 1111 diff --git a/tests/bugs/vis/bug5682 b/tests/bugs/vis/bug5682 deleted file mode 100755 index 6de3d1c7d8..0000000000 --- a/tests/bugs/vis/bug5682 +++ /dev/null @@ -1,25 +0,0 @@ -puts "============" -puts "OCC5682" -puts "============" -puts "" -###################################################### -# AIS_InteractiveContext::Remove does not remove the object from memory -###################################################### - -set BugNumber OCC5682 - -box b 100 100 100 - -vinit -catch {vselmode 4 1} - -set listmem {} -set i_max 5 -for {set i 1} {${i} <= ${i_max}} {incr i} { - vdisplay b - vfit - vclear - - lappend listmem [meminfo h] - checktrend $listmem 0 1 "Memory leak detected" -} diff --git a/tests/demo/draw/getsource b/tests/demo/draw/getsource index 9282696b40..80e2cbaccb 100755 --- a/tests/demo/draw/getsource +++ b/tests/demo/draw/getsource @@ -2,7 +2,7 @@ # check that path returned for command pload is as expected if { [checkplatform -windows] } { - set expected src/Draw/Draw_PloadCommands.cxx + set expected /src/Draw/Draw_PloadCommands.cxx } else { set expected /src/Draw/Draw_PloadCommands.cxx } -- 2.39.5