0024398: Output of extrema draw-command has various format on optimise and debug...

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.

diff --git a/src/GeometryTest/GeometryTest_APICommands.cxx b/src/GeometryTest/GeometryTest_APICommands.cxx
index f78e23d2f30cf643a65cf03a0921dac178ffe760..ea3a9029594527cad14f6fa4f1b01a8950e71379 100755 (executable)
--- 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 15992ca79608d6ecda878455467477313b962fdc..af8d0ff6a2a0939f7aa68c42948d55e38aecaa0f 100644 (file)
--- 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 bbfaa116ecc120f47c9be4d42ece37e7e6cb33e2..7cd9ad40746fd2ba6fe5b67e073f8db3d089f041 100755 (executable)
--- 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 6fe6db569d312f8bb783e761e2e69ed40e7c4713..207023b2a806ee8092c750d7abd4038033b7cba7 100755 (executable)
--- 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 58fd972362e0b834b9b9bc8ae9fad759e25b32ff..743e4e01ac15233c03e27a133d413357b1068d8d 100755 (executable)
--- 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 5d46e2e632ad3bb4093085fc964792f99f850d49..00212e5a86636871002350777082027f899d7df3 100644 (file)
--- 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 38b1fb7bb48d394ccdbcf76fd558762921dff671..916645b137ceefbac5021e31045220d210dc0ebd 100755 (executable)
--- 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 6854f60f77a4c27bf497b148a3feace46d070d04..5244823097eb84fddc53f0dc01035a8b07182df1 100755 (executable)
--- 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 1f52e49b5cc1e850c323cadc725324db0df3f796..c0bbc5f530e7af5580c8d1c43c7bc04f00337ff1 100644 (file)
--- 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 506d7948169fdf9650f91c2813c7cae7da0d7a27..05592f15b347cb1f958bf90b9335f622321b892f 100644 (file)
--- a/tests/perf/bop/buildfaces
+++ b/tests/perf/bop/buildfaces
@@ -1,4 +1,4 @@
-cpulimit 800
+cpulimit 1500
 
 puts "========"
 puts "CR24292"