From 32b6a53fd8bd6b36f7252e7acef13ea5a45ddb16 Mon Sep 17 00:00:00 2001
From: aml <aml@opencascade.com>
Date: Thu, 28 Nov 2013 11:25:41 +0400
Subject: [PATCH] 0024398: Output of extrema draw-command has various format on
 optimise and debug modes

Fixed creation of extrema curve in debug mode.
Deleted space between ";" and "V" in debug output to make "llength" DRAW funcion work correctly in debug mode.
Deleted TODOs in tests/bugs/modalg_5/bug24327
Deleted TODOs in test cases with improvement in extrema output. Increased cpulimit in de, boolean and perf.
---
 src/GeometryTest/GeometryTest_APICommands.cxx | 8 ++++----
 tests/boolean/bsection/N4                     | 2 +-
 tests/bugs/modalg_2/bug23031                  | 2 --
 tests/bugs/modalg_5/bug23706_11               | 2 --
 tests/bugs/modalg_5/bug23706_12               | 2 --
 tests/bugs/modalg_5/bug24327                  | 3 ---
 tests/bugs/moddata_1/bug22733                 | 2 --
 tests/bugs/moddata_2/bug703                   | 2 --
 tests/de/step_3/B5                            | 1 +
 tests/perf/bop/buildfaces                     | 2 +-
 10 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/GeometryTest/GeometryTest_APICommands.cxx b/src/GeometryTest/GeometryTest_APICommands.cxx
index f78e23d2f3..ea3a902959 100755
--- a/src/GeometryTest/GeometryTest_APICommands.cxx
+++ b/src/GeometryTest/GeometryTest_APICommands.cxx
@@ -395,14 +395,14 @@ static Standard_Integer extrema(Draw_Interpretor& di, Standard_Integer n, const
           Handle(Geom_Line) L = new Geom_Line(P1,gp_Vec(P1,P2));
           Handle(Geom_TrimmedCurve) CT = 
             new Geom_TrimmedCurve(L, 0., P1.Distance(P2));
-#ifdef DEB          
-          Sprintf(name,"%s%d (U=%f; V=%f)","ext_",i,U1,V1);
-#else
           Sprintf(name,"%s%d","ext_",i);
-#endif
           char* temp = name; // portage WNT
           DrawTrSurf::Set(temp, CT);
+#ifdef DEB          
+          di << name << "(U=" << U1 << ";V=" << V1 << ")" << "\n";
+#else
           di << name << " ";
+#endif
           }
         }
       }
diff --git a/tests/boolean/bsection/N4 b/tests/boolean/bsection/N4
index 15992ca796..af8d0ff6a2 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 3500
+cpulimit 4000
 
 restore [locate_data_file lh3d_px2.brep] a
 compound result
diff --git a/tests/bugs/modalg_2/bug23031 b/tests/bugs/modalg_2/bug23031
index bbfaa116ec..7cd9ad4074 100755
--- a/tests/bugs/modalg_2/bug23031
+++ b/tests/bugs/modalg_2/bug23031
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: OCC23031: Faulty"
-
 puts "========"
 puts "OCC23031"
 puts "========"
diff --git a/tests/bugs/modalg_5/bug23706_11 b/tests/bugs/modalg_5/bug23706_11
index 6fe6db569d..207023b2a8 100755
--- a/tests/bugs/modalg_5/bug23706_11
+++ b/tests/bugs/modalg_5/bug23706_11
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error : Extrema is wrong"
-
 puts "============"
 puts "OCC23706"
 puts "============"
diff --git a/tests/bugs/modalg_5/bug23706_12 b/tests/bugs/modalg_5/bug23706_12
index 58fd972362..743e4e01ac 100755
--- a/tests/bugs/modalg_5/bug23706_12
+++ b/tests/bugs/modalg_5/bug23706_12
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error : Extrema is wrong"
-
 puts "============"
 puts "OCC23706"
 puts "============"
diff --git a/tests/bugs/modalg_5/bug24327 b/tests/bugs/modalg_5/bug24327
index 5d46e2e632..00212e5a86 100644
--- a/tests/bugs/modalg_5/bug24327
+++ b/tests/bugs/modalg_5/bug24327
@@ -1,6 +1,3 @@
-puts "TODO DEBUG_OCC24327 ALL: Tcl Exception"
-puts "TODO DEBUG_OCC24327 ALL: TEST INCOMPLETE"
-
 puts "============"
 puts "OCC24327"
 puts "============"
diff --git a/tests/bugs/moddata_1/bug22733 b/tests/bugs/moddata_1/bug22733
index 38b1fb7bb4..916645b137 100755
--- a/tests/bugs/moddata_1/bug22733
+++ b/tests/bugs/moddata_1/bug22733
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: OCC22733: Faulty"
-
 puts "========"
 puts "OCC22733"
 puts "========"
diff --git a/tests/bugs/moddata_2/bug703 b/tests/bugs/moddata_2/bug703
index 6854f60f77..5244823097 100755
--- a/tests/bugs/moddata_2/bug703
+++ b/tests/bugs/moddata_2/bug703
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Faulty OCC703"
-
 puts "=========="
 puts "OCC703    "
 puts "=========="
diff --git a/tests/de/step_3/B5 b/tests/de/step_3/B5
index 1f52e49b5c..c0bbc5f530 100644
--- a/tests/de/step_3/B5
+++ b/tests/de/step_3/B5
@@ -1,6 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 
+cpulimit 2000
 
 set filename 612319029MB-HEAD-CYLINDER.stp
 
diff --git a/tests/perf/bop/buildfaces b/tests/perf/bop/buildfaces
index 506d794816..05592f15b3 100644
--- a/tests/perf/bop/buildfaces
+++ b/tests/perf/bop/buildfaces
@@ -1,4 +1,4 @@
-cpulimit 800
+cpulimit 1500
 
 puts "========"
 puts "CR24292"