From 4292bee12ab74e528a7b3464e10cab33dcee07d6 Mon Sep 17 00:00:00 2001 From: mkv Date: Fri, 17 Oct 2014 16:39:54 +0400 Subject: [PATCH] Correction of testing cases --- tests/bugs/modalg_1/bug19793_2 | 45 ++++++++++++++++++++++------------ tests/bugs/modalg_5/bug24074 | 2 +- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/tests/bugs/modalg_1/bug19793_2 b/tests/bugs/modalg_1/bug19793_2 index 7ae93abb0e..81c13639d6 100755 --- a/tests/bugs/modalg_1/bug19793_2 +++ b/tests/bugs/modalg_1/bug19793_2 @@ -6,7 +6,7 @@ puts "" # Fuse problem of symetrical shapes. Appendix for NPAL19789 ####################################################################### -cpulimit 1000 +cpulimit 2500 set BugNumber OCC19793 puts "Load first shape ..." @@ -41,21 +41,36 @@ set nb_shape_good 139 # Performance verification of bop operation set chrono_info [dchrono perf_h show] regexp {CPU user time: ([-0-9.+eE]+) seconds} $chrono_info full CPU_time -set currentOS $tcl_platform(os) -if {[string compare $currentOS "Windows NT"] == 0} { - puts "Checking WINDOWS performance..." - # Initial CPU_time is 92-94 seconds for Windows - if {$CPU_time > 200.} { - puts "ERROR: OCC23753 is reproduced." - puts " Low performance: $CPU_time" + +if { [regexp {Debug mode} [dversion]] } { + if { [regexp {Windows} [dversion]] } { + puts "Checking WINDOWS performance..." + if {$CPU_time > 1000.} { + puts "ERROR: OCC23753 is reproduced." + puts " Low performance: $CPU_time" + } + } else { + puts "Checking LINUX performance..." + if {$CPU_time > 2500.} { + puts "ERROR: OCC23753 is reproduced." + puts " Low performance: $CPU_time" + } } -} -if {[string compare $currentOS "Linux"] == 0} { - puts "Checking LINUX performance..." - # Initial CPU_time is 287-289 seconds for Linux - if {$CPU_time > 250.} { - puts "ERROR: OCC23753 is reproduced." - puts " Low performance: $CPU_time" +} else { + if { [regexp {Windows} [dversion]] } { + puts "Checking WINDOWS performance..." + # Initial CPU_time is 92-94 seconds for Windows + if {$CPU_time > 200.} { + puts "ERROR: OCC23753 is reproduced." + puts " Low performance: $CPU_time" + } + } else { + puts "Checking LINUX performance..." + # Initial CPU_time is 287-289 seconds for Linux + if {$CPU_time > 250.} { + puts "ERROR: OCC23753 is reproduced." + puts " Low performance: $CPU_time" + } } } diff --git a/tests/bugs/modalg_5/bug24074 b/tests/bugs/modalg_5/bug24074 index ba7c62b982..11b12564f8 100644 --- a/tests/bugs/modalg_5/bug24074 +++ b/tests/bugs/modalg_5/bug24074 @@ -1,6 +1,6 @@ #puts "TODO OCC24074 Debian60-64 Windows: An exception was caught" puts "TODO OCC24074 Debian60-64 Windows: Error: Offset is not done" -#puts "TODO OCC24074 Debian60-64 Windows: TEST INCOMPLETE" +puts "TODO OCC24074 Debian60-64 Windows: TEST INCOMPLETE" puts "============" puts "OCC24074"