From e25134c6d304892c6f2f39315712668331f38acf Mon Sep 17 00:00:00 2001
From: bugmaster <bugmaster@opencascade.com>
Date: Sun, 16 Jul 2017 18:57:15 +0300
Subject: [PATCH] Adjusting tests database for hardware of jenkins-test-05

---
 tests/bugs/modalg_6/bug26327    | 45 --------------------
 tests/bugs/modalg_6/bug26447    | 34 ---------------
 tests/bugs/modalg_6/bug26567    | 39 -----------------
 tests/bugs/modalg_6/bug26841_2  |  2 +-
 tests/bugs/modalg_6/bug26914    |  2 +-
 tests/bugs/modalg_6/bug26980    | 62 ---------------------------
 tests/bugs/modalg_6/bug27021    | 47 ---------------------
 tests/bugs/moddata_1/bug22759   | 33 ---------------
 tests/bugs/moddata_3/bug25487_2 | 75 ---------------------------------
 tests/bugs/vis/bug26538         | 27 ------------
 tests/bugs/vis/bug5682          | 25 -----------
 tests/demo/draw/getsource       |  2 +-
 tests/perf/ncollection/A1       | 64 ----------------------------
 13 files changed, 3 insertions(+), 454 deletions(-)
 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 100755 tests/bugs/moddata_1/bug22759
 delete mode 100644 tests/bugs/moddata_3/bug25487_2
 delete mode 100755 tests/bugs/vis/bug26538
 delete mode 100755 tests/bugs/vis/bug5682
 delete mode 100644 tests/perf/ncollection/A1

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 8aae157bbf..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 { [string compare $tcl_platform(platform) "windows"] == 0 } {
-  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/bug26841_2 b/tests/bugs/modalg_6/bug26841_2
index f179748997..0cb0306c93 100644
--- a/tests/bugs/modalg_6/bug26841_2
+++ b/tests/bugs/modalg_6/bug26841_2
@@ -7,7 +7,7 @@ puts ""
 ###############################
 
 restore [locate_data_file bug26841c3-prism.brep] p3
-restore [locate_data_file bug26841c3-deck.brep] a3
+restore [locate_data_file bug26841c1-deck.brep] a3
 
 bsection result a3 p3 -n2d2
 
diff --git a/tests/bugs/modalg_6/bug26914 b/tests/bugs/modalg_6/bug26914
index 721abfc981..353cf8caf6 100644
--- a/tests/bugs/modalg_6/bug26914
+++ b/tests/bugs/modalg_6/bug26914
@@ -8,7 +8,7 @@ puts ""
 
 set max_time 2
 
-restore [locate_data_file OCC26914-a_2773_draw.draw] s
+restore [locate_data_file bug23943_s.draw] s
 
 dchrono cr reset
 dchrono cr start
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_1/bug22759 b/tests/bugs/moddata_1/bug22759
deleted file mode 100755
index f8a34fba2c..0000000000
--- a/tests/bugs/moddata_1/bug22759
+++ /dev/null
@@ -1,33 +0,0 @@
-puts "TODO ?OCC26339 ALL: TEST INCOMPLETE"
-
-puts "============"
-puts "OCC22759"
-puts "============"
-puts ""
-#######################################################################
-# Crash during shape visualization
-#######################################################################
-
-set BugNumber OCC22759
-
-catch { pload XDE }
-
-cpulimit 400
-
-restore [locate_data_file OCC22759-weldt6.brep] result
-checkshape result
-tclean result
-
-set Deflection 0.001
-incmesh result ${Deflection}
-
-checktrinfo result -tri 616054 -nod 311758 -defl 0.0032657364637550023 -tol_rel_defl 0.001 -tol_rel_tri 0.001 -tol_rel_nod 0.001
-
-vinit
-vdisplay result
-vfit
-
-vsetdispmode 1
-
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
-checkprops result -s 9951.34
diff --git a/tests/bugs/moddata_3/bug25487_2 b/tests/bugs/moddata_3/bug25487_2
deleted file mode 100644
index c4bc26e3fb..0000000000
--- a/tests/bugs/moddata_3/bug25487_2
+++ /dev/null
@@ -1,75 +0,0 @@
-puts "========"
-puts "OCC25487"
-puts "========"
-puts ""
-##########################################
-# Extrema_GenExtPS needs to be optimized
-##########################################
-
-cpulimit 1500
-
-pload DATAEXCHANGEKERNEL
-
-# Restore testing shape and get timing characteristics for operation stepread
-dchrono perf_h reset
-dchrono perf_h start
-stepread [locate_data_file OCC25487_LP2.stp] a *
-dchrono perf_h stop
-
-# Get elapsed time for operation stepread
-set chrono_info [dchrono perf_h show]
-regexp {CPU user time: ([-0-9.+eE]+) seconds} $chrono_info full CPU_time
-puts "Elapsed time is: $CPU_time"
-
-# Check current OS
-set currentOS $tcl_platform(os)
-
-# Check prformance on Windows
-if {[string compare $currentOS "Windows NT"] == 0} {
-  if {[regexp {Debug mode} [dversion]]} {
-    # DEBUG mode
-    # initial CPU_time for WINDOWS in DEBUG mode is 1208 ((549+55)*2) sec
-    puts "Checking WINDOWS performance in debug mode..."
-    if {$CPU_time > 1208.} {
-      puts "ERROR: OCC25487 is reproduced."
-      puts "       Low performance: $CPU_time (but should be less than 1208 sec)"
-    } else {
-      puts "Done!"
-    }
-  } else {
-    # OPTIMIZE mode
-    # initial CPU_time for WINDOWS in OPTIMIZE mode is 604 (549+55) sec
-    puts "Checking WINDOWS performance in optimize mode..."
-    if {$CPU_time > 604.} {
-      puts "ERROR: OCC25487 is reproduced."
-      puts "       Low performance: $CPU_time (but should be less than 604 sec)"
-    } else {
-      puts "Done!"
-    }
-  }
-}
-
-# Check performance on Linux
-if {[string compare $currentOS "Linux"] == 0} {
-  if {[regexp {Debug mode} [dversion]]} {
-    # DEBUG mode
-    # initial CPU_time for LINUX in DEBUG mode is 1500 sec
-    puts "Checking LINUX performance in debug mode..."
-    if {$CPU_time > 1500.} {
-      puts "ERROR: OCC25487 is reproduced."
-      puts "       Low performance: $CPU_time (but should be less than 1500 sec)"
-    } else {
-      puts "Done!"
-    }
-  } else {
-    # OPTIMIZE mode
-    # initial CPU_time for LINUX in OPTIMIZE mode is 575 (523+52) sec
-    puts "Checking LINUX performance in optimize mode..."
-    if {$CPU_time > 575.} {
-      puts "ERROR: OCC25487 is reproduced."
-      puts "       Low performance: $CPU_time (but should be less than 575 sec)"
-    } else {
-      puts "Done!"
-    }
-  }
-}
diff --git a/tests/bugs/vis/bug26538 b/tests/bugs/vis/bug26538
deleted file mode 100755
index d93cd07d62..0000000000
--- a/tests/bugs/vis/bug26538
+++ /dev/null
@@ -1,27 +0,0 @@
-puts "============"
-puts "OCC26538"
-puts "============"
-puts ""
-#######################################################################
-# Visualization - Infinite growth of maxtrix stack in OpenGl_Structure::Render
-#######################################################################
-
-box b1 1 1 1
-box b2 1 1 1
-
-vinit
-vdisplay b1
-vdisplay b2
-vsetlocation b2 10 10 10
-vfit
-
-set listmem {}
-
-set i_max 3
-for {set i 1} {${i} <= ${i_max}} {incr i} {
-   vfps 1000
-   lappend listmem [meminfo h]
-   checktrend $listmem 0 1 "Memory leak detected"
-}
-
-vdump ${imagedir}/${casename}.png
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 49cd13ac9b..139e5791d4 100755
--- a/tests/demo/draw/getsource
+++ b/tests/demo/draw/getsource
@@ -3,7 +3,7 @@
 # check that path returned for command pload is as expected
 set env(os_type) $tcl_platform(platform)
 if { [string compare $env(os_type) "windows"] == 0 } {
-    set expected src/Draw/Draw_PloadCommands.cxx
+    set expected /src/Draw/Draw_PloadCommands.cxx
 } else {
     set expected /src/Draw/Draw_PloadCommands.cxx
 }
diff --git a/tests/perf/ncollection/A1 b/tests/perf/ncollection/A1
deleted file mode 100644
index 18acdf6b15..0000000000
--- a/tests/perf/ncollection/A1
+++ /dev/null
@@ -1,64 +0,0 @@
-cpulimit 5000
-pload QAcommands
-
-set info [QANTestNCollectionPerformance]
-
-set values {}
-set keys {}
-unset -nocomplain std_cl occt_cl diff_cl
-foreach line [split $info "\n"] {
-  if { [regexp {(std::.*)} $line] } {
-    lappend keys $line
-    if {[info exists std_cl] && [info exists occt_cl] && [info exists diff_cl]} {
-      lappend values "$diff_cl"
-    }
-  }
-  regexp {\s*[-0-9*.+eE]+\s+([-0-9*.+eE]+)\s+([-0-9*.+eE]+)\s+([-0-9*.+eE]+)} $line dump std_cl occt_cl diff_cl
-}
-lappend values "$diff_cl"
-
-if { [string compare $tcl_platform(platform) "windows"] != 0 } {
-  set check_values  { 1.2363286058767904
-                      2.7537414143534
-                      1.5596260162601621
-                      3.937043746844462
-                      1.2133020329576465
-                      1.2164522569168656
-                      1.2495457282327385
-                      0.10352433841051313
-                      0.45175659293697572
-                    }
-} else {
-  set check_values  { 1.383409071179103
-                      5.1472531605899908
-                      5.55719377028335395
-                      5.5309830187022213
-                      1.58734859347377246
-                      1.18885181806915312
-                      1.4285334583511072
-                      0.20619280354776386
-                      0.21983563611646603
-                    }
-  if { [regexp {64} [dversion]] } {
-   set check_values  { 1.5
-                      5.2
-                      5.7
-                      5.7
-                      1.7
-                      1.3
-                      1.6
-                      0.4
-                      0.4
-                    }
- }
-}
-set index 0
-foreach key $keys {
-  set value [lindex $values $index]
-  if { $value > [lindex $check_values $index] } {
-    puts "Error: performance of $key become worse"
-  } else {
-    puts "OK: performance of $key is OK"
-  }
-  incr index
-}