0026598: Some test cases fail if macros OCCT_DEBUG is enabled

Added procedure checkdebugmode.
Cpu limits were increased for debug mode to eliminate failed test cases.
Updated parse.rules files to ignore extended output message in debug mode during testing.

diff --git a/dox/dev_guides/tests/tests.md b/dox/dev_guides/tests/tests.md
index dc9ef55b75c2d93bf69cc44fac28f8329cb8a5cf..e2410584fb700c82e15b380cbda15d10388e11d5 100644 (file)
--- a/dox/dev_guides/tests/tests.md
+++ b/dox/dev_guides/tests/tests.md
@@ -609,6 +609,8 @@ Draw[2]> checkplatform
 Windows
 ~~~~~
 
+Use procedure *checkdebugmode* to get the configuration. It returns 1 if current configuration is 'Debug', overwise returns 0.
+
 * RegularExpression is a regular expression, which should be matched against the line indicating the problem in the script output. 
 
 Example:

diff --git a/src/Approx/Approx_SweepApproximation.cxx b/src/Approx/Approx_SweepApproximation.cxx
index 590e713af07b3ec3c7edcc7b694b809842395d09..a42ce27e62416ba178441eb0cc8a05f9419daa5c 100644 (file)
--- a/src/Approx/Approx_SweepApproximation.cxx
+++ b/src/Approx/Approx_SweepApproximation.cxx
@@ -730,10 +730,10 @@ Standard_Real Approx_SweepApproximation::TolCurveOnSurf(const Standard_Integer I
 {
   o << "Dump of SweepApproximation" << endl;
   if (done) { 
-    o << "Error 3d = " << MaxErrorOnSurf() << endl;
+    o << "DEBUG: Error 3d = " << MaxErrorOnSurf() << endl;
 
     if (Num2DSS>0) {
-      o << "Error 2d = ";
+      o << "DEBUG: Error 2d = ";
       for (Standard_Integer ii=1; ii<=Num2DSS; ii++) 
        {  o << Max2dError(ii);
           if (ii < Num2DSS) o << " , " << endl;

diff --git a/src/BRepCheck/BRepCheck_Wire.cxx b/src/BRepCheck/BRepCheck_Wire.cxx
index 2f1e7a6a3ce071af3cdae3536be0c09e8575a560..0fd13f4dfa99dc0781b27a1b6e1cfdad51d3aad9 100644 (file)
--- a/src/BRepCheck/BRepCheck_Wire.cxx
+++ b/src/BRepCheck/BRepCheck_Wire.cxx
@@ -382,7 +382,7 @@ Standard_Boolean IsDistanceIn3DTolerance (const gp_Pnt& thePnt_f,
 #ifdef OCCT_DEBUG
   cout << endl;
   cout << "--------Function IsDistanceIn3DTolerance(...)----------"                                                                                            << endl;
-  cout << "--- BRepCheck Wire: Closed3d -> Error"                                                                                                                                                                      << endl;
+  cout << "DEBUG: --- BRepCheck Wire: Closed3d -> Error"                                                                                                                                                                       << endl;
   cout << "--- Dist (" << Dist << ") > Tol3d (" << aTol3d << ")"                                                                                                       << endl;
   cout << "Pnt1(" << thePnt_f.X() << "; " << thePnt_f.Y() << "; " << thePnt_f.Z() << ")"       << endl;
   cout << "Pnt2(" << thePnt_l.X() << "; " << thePnt_l.Y() << "; " << thePnt_l.Z() << ")"       << endl;

diff --git a/src/DrawResources/CheckCommands.tcl b/src/DrawResources/CheckCommands.tcl
index c6a06c8cf3df5ad160dcc90f9bb3f49e95d2bfc9..074d6d244c9348731c4adbee615d380657e49cb1 100644 (file)
--- a/src/DrawResources/CheckCommands.tcl
+++ b/src/DrawResources/CheckCommands.tcl
@@ -43,9 +43,16 @@ proc checkcolor { coord_x coord_y rd_get gr_get bl_get } {
 
     set color ""
     catch { [set color "[vreadpixel ${coord_x} ${coord_y} rgb]"] }
+
     if {"$color" == ""} {
       puts "Error : Pixel coordinates (${position_x}; ${position_y}) are out of view"
     }
+
+    # Skip debug information if necessary
+    if {[llength $color] != 3} {
+      regexp {([0-9]+ [0-9]+ [0-9]+)} $color dump color
+    }
+
     set rd [lindex $color 0]
     set gr [lindex $color 1]
     set bl [lindex $color 2]
@@ -127,6 +134,12 @@ proc _checkpoint {coord_x coord_y rd_ch gr_ch bl_ch} {
             incr j
             continue
           }
+
+          # Skip debug information if necessary
+          if {[llength $color] != 3} {
+            regexp {([0-9]+ [0-9]+ [0-9]+)} $color dump color
+          }
+
           set rd [lindex $color 0]
           set gr [lindex $color 1]
           set bl [lindex $color 2]
@@ -1085,3 +1098,17 @@ proc checkplatform {args} {
     # current platform is not equal to given as argument platform, return false
     return 0
 }
+
+help checkdebugmode {
+  return 1 if current configuration is 'Debug', overwise return 0
+
+  Use: checkdebugmode
+}
+proc checkdebugmode {} {
+  catch {set dversion_log [dversion]}
+  if { [regexp {Debug mode} ${dversion_log}] || [regexp {Extended debug mode} ${dversion_log}]} {
+    return 1
+  } else {
+    return 0
+  }
+}

diff --git a/src/GeomPlate/GeomPlate_MakeApprox.cxx b/src/GeomPlate/GeomPlate_MakeApprox.cxx
index dc53d80cf44ea23bc7b2bb71ff8b05f5c0f0e695..05a0b98bbc2c2cde3c49d6a92635638b5ae7281d 100644 (file)
--- a/src/GeomPlate/GeomPlate_MakeApprox.cxx
+++ b/src/GeomPlate/GeomPlate_MakeApprox.cxx
@@ -297,8 +297,8 @@ GeomPlate_MakeApprox::GeomPlate_MakeApprox(const Handle(GeomPlate_Surface)& Surf
   myCritError = AppPlate.CritError(3,1);
 #ifdef OCCT_DEBUG
   cout<<"Approximation results"<<endl;
-  cout<<"  Approximation error : "<<myAppError<<endl;
-  cout<<"  Criterium error : "<<myCritError<<endl;
+  cout<<"DEBUG: Approximation error : "<<myAppError<<endl;
+  cout<<"DEBUG: Criterium error : "<<myCritError<<endl;
 #endif
 }
 
@@ -406,7 +406,7 @@ GeomPlate_MakeApprox::GeomPlate_MakeApprox(const Handle(GeomPlate_Surface)& Surf
     myCritError = 0.;
 #ifdef OCCT_DEBUG
     cout<<"Approximation results"<<endl;
-    cout<<"  Approximation error : "<<myAppError<<endl;
+    cout<<"DEBUG: Approximation error : "<<myAppError<<endl;
 #endif
   }
   else if (CritOrder==0) {
@@ -428,8 +428,8 @@ GeomPlate_MakeApprox::GeomPlate_MakeApprox(const Handle(GeomPlate_Surface)& Surf
     myCritError = AppPlate.CritError(3,1);
 #ifdef OCCT_DEBUG
     cout<<"Approximation results"<<endl;
-    cout<<"  Approximation error : "<<myAppError<<endl;
-    cout<<"  Criterium error : "<<myCritError<<endl;
+    cout<<"DEBUG: Approximation error : "<<myAppError<<endl;
+    cout<<"DEBUG: Criterium error : "<<myCritError<<endl;
 #endif
   }
   else if (CritOrder==1) {
@@ -451,8 +451,8 @@ GeomPlate_MakeApprox::GeomPlate_MakeApprox(const Handle(GeomPlate_Surface)& Surf
     myCritError = AppPlate.CritError(3,1);
 #ifdef OCCT_DEBUG
     cout<<"Approximation results"<<endl;
-    cout<<"  Approximation error : "<<myAppError<<endl;
-    cout<<"  Criterium error : "<<myCritError<<endl;
+    cout<<"DEBUG: Approximation error : "<<myAppError<<endl;
+    cout<<"DEBUG: Criterium error : "<<myCritError<<endl;
 #endif
   }
 }

diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
index 11f9ce41e5ee3b0a9d2096cde92809485d7cc275..2c67bcb16709d9acb436387c01a5df649f62a8ee 100644 (file)
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -1095,7 +1095,7 @@ TDF_Label STEPCAFControl_Reader::FindInstance (const Handle(StepRepr_NextAssembl
   Handle(Transfer_Binder) binder = TP->Find(NAUO);
   if ( binder.IsNull() || ! binder->HasResult() ) {
 #ifdef OCCT_DEBUG
-    cout << "Error: STEPCAFControl_Reader::FindInstance: NAUO is not mapped to shape" << endl;
+    cout << "DEBUG: Error: STEPCAFControl_Reader::FindInstance: NAUO is not mapped to shape" << endl;
 #endif
     return L;
   }
@@ -1103,7 +1103,7 @@ TDF_Label STEPCAFControl_Reader::FindInstance (const Handle(StepRepr_NextAssembl
   TopoDS_Shape S = TransferBRep::ShapeResult ( TP, binder );
   if ( S.IsNull() ) {
 #ifdef OCCT_DEBUG
-    cout << "Error: STEPCAFControl_Reader::FindInstance: NAUO is not mapped to shape" << endl;
+    cout << "DEBUG: Error: STEPCAFControl_Reader::FindInstance: NAUO is not mapped to shape" << endl;
 #endif
     return L;
   }

diff --git a/src/STEPConstruct/STEPConstruct_Styles.cxx b/src/STEPConstruct/STEPConstruct_Styles.cxx
index ad131f96c001c5f8015232bc547278f43f17d335..930d23a44b2e7d21f6d72f374352983f1f773cba 100644 (file)
--- a/src/STEPConstruct/STEPConstruct_Styles.cxx
+++ b/src/STEPConstruct/STEPConstruct_Styles.cxx
@@ -725,7 +725,7 @@ Standard_Boolean STEPConstruct_Styles::DecodeColor (const Handle(StepVisual_Colo
     else if ( name.IsEqual ( "white"   ) ) Col.SetValues ( Quantity_NOC_WHITE );
     else {
 #ifdef OCCT_DEBUG
-      cout << "Error: color name \"" << name << "\" is not recognized" << endl;
+      cout << "DEBUG: Error: color name \"" << name << "\" is not recognized" << endl;
 #endif
       return Standard_False;
     }

diff --git a/src/ShapeConstruct/ShapeConstruct.cxx b/src/ShapeConstruct/ShapeConstruct.cxx
index b8b6b1f6eb7b7b2e2bb3c8adc896e921985881f6..a14a4bd1f4aed5e9748fc6e0925ece2374f14da9 100644 (file)
--- a/src/ShapeConstruct/ShapeConstruct.cxx
+++ b/src/ShapeConstruct/ShapeConstruct.cxx
@@ -240,7 +240,7 @@ Handle(Geom_BSplineSurface) ShapeConstruct::ConvertSurfaceToBSpline(const Handle
        
 #ifdef OCCT_DEBUG
        Standard_Integer nbOfSpan = (anApprox.Surface()->NbUKnots()-1)*(anApprox.Surface()->NbVKnots()-1);
-       cout << "\terror = " << anApprox.MaxError() << "\tspans = " << nbOfSpan << endl;
+       cout << "DEBUG:\terror = " << anApprox.MaxError() << "\tspans = " << nbOfSpan << endl;
        cout << " Surface is aproximated with continuity " << (GeomAbs_Shape)cnt <<endl;
 #endif
        S = anApprox.Surface();
@@ -251,7 +251,7 @@ Handle(Geom_BSplineSurface) ShapeConstruct::ConvertSurfaceToBSpline(const Handle
        if(anApprox.HasResult()) 
          errSpl = anApprox.Surface();
 #ifdef OCCT_DEBUG
-       cout << "\terror = " << anApprox.MaxError() <<endl;
+       cout << "DEBUG:\terror = " << anApprox.MaxError() <<endl;
 #endif
        break;
       }

diff --git a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
index 9a5e73bda27f856b40228bce4136f068f6aa4c6e..835ee33277b2dc8068c03116785ef4c7060e8a36 100644 (file)
--- a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
+++ b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
@@ -683,7 +683,7 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertSurface(const Handle(Geo
             nbOfSpan = (anApprox.Surface()->NbUKnots()-1)*(anApprox.Surface()->NbVKnots()-1);
 #ifdef OCCT_DEBUG
             if((imax-i+1)!=1) {
-              cout << " iteration = " << i
+              cout << "DEBUG: iteration = " << i
                 <<    "\terror = " << anApprox.MaxError()
                 <<    "\tspans = " << nbOfSpan << endl;
               cout<< " Surface is aproximated with continuity " << IntegerToGeomAbsShape(Min(aCU,aCV)) <<endl;

diff --git a/src/ShapeFix/ShapeFix_ComposeShell.cxx b/src/ShapeFix/ShapeFix_ComposeShell.cxx
index 9afe4ffa017385d20dc88bebbfc5a7ed28734f5b..5d317491c484a3372cd3494873c1378bec5cf6c0 100644 (file)
--- a/src/ShapeFix/ShapeFix_ComposeShell.cxx
+++ b/src/ShapeFix/ShapeFix_ComposeShell.cxx
@@ -1680,7 +1680,7 @@ void ShapeFix_ComposeShell::SplitByLine (ShapeFix_SequenceOfWireSegment &wires,
   if ( parity % 2 ) {
     myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_FAIL4 );
 #ifdef OCCT_DEBUG
-    cout << "Error: ShapeFix_ComposeShell::SplitByLine: parity error" << endl;
+    cout << "DEBUG: Error: ShapeFix_ComposeShell::SplitByLine: parity error" << endl;
 #endif
   }
 
@@ -2471,7 +2471,7 @@ void ShapeFix_ComposeShell::MakeFacesOnPatch (TopTools_SequenceOfShape &faces,
   // check for lost wires, and if they are, make them roots
   if ( roots.Length() <=0 && loops.Length() >0 ) {
 #ifdef OCCT_DEBUG
-    cout << "Error: ShapeFix_ComposeShell::MakeFacesOnPatch: can't dispatch wires" << endl;
+    cout << "DEBUG: Error: ShapeFix_ComposeShell::MakeFacesOnPatch: can't dispatch wires" << endl;
 #endif
     for ( Standard_Integer j=1; j <= loops.Length(); j++ ) {
       roots.Append ( loops(j) );
@@ -2542,7 +2542,7 @@ void ShapeFix_ComposeShell::MakeFacesOnPatch (TopTools_SequenceOfShape &faces,
     // check for lost wires, and if they are, make them roots
     if ( i == roots.Length() && loops.Length() >0 ) {
 #ifdef OCCT_DEBUG
-      cout << "Error: ShapeFix_ComposeShell::MakeFacesOnPatch: can't dispatch wires" << endl;
+      cout << "DEBUG: Error: ShapeFix_ComposeShell::MakeFacesOnPatch: can't dispatch wires" << endl;
 #endif
       for ( j=1; j <= loops.Length(); j++ ) {
         TopoDS_Shape aSh = loops(j);

diff --git a/src/ShapeFix/ShapeFix_EdgeProjAux.cxx b/src/ShapeFix/ShapeFix_EdgeProjAux.cxx
index 8488355d9db71a297152ecd459a3a8eafe776369..8e6b9d09ffa6129c53d958592e301a210289bb85 100644 (file)
--- a/src/ShapeFix/ShapeFix_EdgeProjAux.cxx
+++ b/src/ShapeFix/ShapeFix_EdgeProjAux.cxx
@@ -587,7 +587,7 @@ void ShapeFix_EdgeProjAux::UpdateParam2d (const Handle(Geom2d_Curve)& theCurve2d
     else if ( Abs ( myLastParam  - cf ) <= preci2d ) myLastParam  = cl;
     else {
 #ifdef OCCT_DEBUG
-      cout << "Error : curve 2d range crossing non periodic curve origin";
+      cout << "DEBUG: Error : curve 2d range crossing non periodic curve origin";
       cout <<  endl;
 #endif
       // add fail result;

diff --git a/src/ShapeFix/ShapeFix_WireSegment.cxx b/src/ShapeFix/ShapeFix_WireSegment.cxx
index cca114edc3ac07030d00dfbecd66411130d10e89..439de1c68227bda6174eba5fd9d43425b12036c4 100644 (file)
--- a/src/ShapeFix/ShapeFix_WireSegment.cxx
+++ b/src/ShapeFix/ShapeFix_WireSegment.cxx
@@ -243,7 +243,7 @@ void ShapeFix_WireSegment::DefineIUMin (const Standard_Integer i,
   if ( myIUMin->Value(i) < iumin ) myIUMin->SetValue ( i, iumin );
 #ifdef OCCT_DEBUG
   if ( myIUMin->Value(i) > myIUMax->Value(i) )
-    cout << "Warning: ShapeFix_WireSegment::DefineIUMin: indexation error" << endl;
+    cout << "DEBUG: Warning: ShapeFix_WireSegment::DefineIUMin: indexation error" << endl;
 #endif
 }
 
@@ -259,7 +259,7 @@ void ShapeFix_WireSegment::DefineIUMax (const Standard_Integer i,
 #ifdef OCCT_DEBUG
   Standard_Integer iun = myIUMin->Value(i), iux = myIUMax->Value(i);
   if ( iun > iux )
-    cout << "Warning: ShapeFix_WireSegment::DefineIUMax: indexation error" << endl;
+    cout << "DEBUG: Warning: ShapeFix_WireSegment::DefineIUMax: indexation error" << endl;
 #endif
 }
 
@@ -275,7 +275,7 @@ void ShapeFix_WireSegment::DefineIVMin (const Standard_Integer i,
 #ifdef OCCT_DEBUG
   Standard_Integer ivn = myIVMin->Value(i), ivx = myIVMax->Value(i);
   if ( ivn > ivx )
-    cout << "Warning: ShapeFix_WireSegment::DefineIVMin: indexation error" << endl;
+    cout << "DEBUG: Warning: ShapeFix_WireSegment::DefineIVMin: indexation error" << endl;
 #endif
 }
 
@@ -291,7 +291,7 @@ void ShapeFix_WireSegment::DefineIVMax (const Standard_Integer i,
 #ifdef OCCT_DEBUG
   Standard_Integer ivn = myIVMin->Value(i), ivx = myIVMax->Value(i);
   if ( ivn > ivx )
-    cout << "Warning: ShapeFix_WireSegment::DefineIVMax: indexation error" << endl;
+    cout << "DEBUG: Warning: ShapeFix_WireSegment::DefineIVMax: indexation error" << endl;
 #endif
 }
 
@@ -324,7 +324,7 @@ Standard_Boolean ShapeFix_WireSegment::CheckPatchIndex (const Standard_Integer i
   Standard_Boolean ok = ( dU ==0 || dU ==1 ) && ( dV ==0 || dV ==1 );
 #ifdef OCCT_DEBUG
   if ( ! ok )
-    cout << "Warning: ShapeFix_WireSegment::CheckPatchIndex: incomplete indexation" << endl;
+    cout << "DEBUG: Warning: ShapeFix_WireSegment::CheckPatchIndex: incomplete indexation" << endl;
 #endif
   return ok;
 }

diff --git a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
index 518f0e9752003f624ccf64eb1e7bd6e9d5b60d0e..3f45523b8db86faaf4dda9ba9e5d6aa255c6d25a 100644 (file)
--- a/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
@@ -460,7 +460,7 @@ void ShapeUpgrade_WireDivide::Perform ()
          Standard_Integer nbc2d = theSegments2d->Length();
          if (nbc!=nbc2d) {
 #ifdef OCCT_DEBUG
-           cout<<"Error: Number of intervals are not equal for 2d 3d. Ignored."<<endl;
+           cout<<"DEBUG: Error: Number of intervals are not equal for 2d 3d. Ignored."<<endl;
 #endif
            nbc = Min( nbc,nbc2d);
          }

diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx
index bcfd329a9a38b7217d521c0dd8ab614b380425a6..31a81d933824915a6d68fcd47d359174bdc69744 100644 (file)
--- a/src/StepData/StepData_StepReaderData.cxx
+++ b/src/StepData/StepData_StepReaderData.cxx
@@ -189,7 +189,7 @@ void StepData_StepReaderData::SetRecord (const Standard_Integer num,
              prev --;  if (prev <= 0) break;
            }
            Handle(Message_Messenger) sout = Message::DefaultMessenger();
-           sout << "  ***  Error on Record " << num << " (on " << NbRecords()
+           sout << "DEBUG: ***  Error on Record " << num << " (on " << NbRecords()
              << " -> " << num*100/NbRecords() << " % in File)  ***";
            if (prev > 0) sout << "  Ident #" << theidents(prev);
            sout << "\n" << errm << endl;

diff --git a/src/StepFile/StepFile_Read.cxx b/src/StepFile/StepFile_Read.cxx
index 9ce43273dcba5ec764685bf87a88334e412f7b73..cf2adc6cfc35772f2b88cec1cd8074b044fb78f6 100644 (file)
--- a/src/StepFile/StepFile_Read.cxx
+++ b/src/StepFile/StepFile_Read.cxx
@@ -232,7 +232,7 @@ void StepFile_Interrupt (char* mess)
 {
 #ifdef OCCT_DEBUG
   Handle(Message_Messenger) sout = Message::DefaultMessenger();
-  sout << "    ****    StepFile Error : " << mess << "    ****" << endl;
+  sout << "DEBUG: ****    StepFile Error : " << mess << "    ****" << endl;
 #endif
   checkread->AddFail(mess);
 }

diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
index 38f7f94d23ece66d4c682325328afd5864af825f..ad105a2f5b79220ea0dd4d4177720f2c150a0d9f 100644 (file)
--- a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
@@ -271,7 +271,7 @@ void TopoDSToStep_MakeStepFace::Init(const TopoDS_Face& aFace,
       if (MkWire.IsDone()) Loop = Handle(StepShape_Loop)::DownCast(MkWire.Value());
       else {
 #ifdef OCCT_DEBUG
-       cout << TopoDSToStep::DecodeWireError(MkWire.Error())->String() << endl;
+       cout << "DEBUG: " << TopoDSToStep::DecodeWireError(MkWire.Error())->String() << endl;
 #endif
        FP->AddWarning(errShape, " a Wire not mapped");
        continue;

diff --git a/tests/3rdparty/export/begin b/tests/3rdparty/export/begin
index 3d4929419a27aa9132d73b0a6eca8a283615163a..66734328178dc91ebbc30023e50d3640103051a9 100644 (file)
--- a/tests/3rdparty/export/begin
+++ b/tests/3rdparty/export/begin
@@ -1,6 +1,6 @@
 # On Windows with VC, in typical configuration gl2ps is built with Release
 # mode only which will fail in Debug
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
     puts "TODO ?#23540 windows: Error: export of image.*failed"
     puts "TODO ?#23540 windows: Error: The file has been exported.*different size \[(\]0 "
 }

diff --git a/tests/blend/parse.rules b/tests/blend/parse.rules
index bca616b06f985f3a5e2672cf4887eb0a0adbdbdd..f8b7502b92077f887f3f78d100afc1a66e8d8a7e 100644 (file)
--- a/tests/blend/parse.rules
+++ b/tests/blend/parse.rules
@@ -1,3 +1,6 @@
 FAILED /\bFaulty\b/ bad shape
 IGNORE /^Tcl Exception: tolerance ang : [\d.-]+/ blend failure - test will be failed as incomplete
-OK /Relative error of mass computation/ message from vprops
\ No newline at end of file
+OK /Relative error of mass computation/ message from vprops
+IGNORE /DEBUG: Approximation error :/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Criterium error :/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error [23]d =/ extended messages of OCCT algorithms only for Debug configuration
\ No newline at end of file

diff --git a/tests/boolean/bsection/N5 b/tests/boolean/bsection/N5
index 1f9b5ea41e019f4e19d51deb9582fe09798fe63b..98414084e245216a01d865a0fee84114538d7d1b 100644 (file)
--- a/tests/boolean/bsection/N5
+++ b/tests/boolean/bsection/N5
@@ -1,4 +1,4 @@
-cpulimit 1000
+cpulimit 2000
 
 restore [locate_data_file lh3d_px2.brep] a
 set i 1

diff --git a/tests/boolean/gdml_private/ZG4 b/tests/boolean/gdml_private/ZG4
index 095c42060deb022eab90b607a5554191692aea06..929608dd24208fe649de715aef767811cbd40740 100644 (file)
--- a/tests/boolean/gdml_private/ZG4
+++ b/tests/boolean/gdml_private/ZG4
@@ -1,2 +1,5 @@
+if { [checkdebugmode] } {
+  cpulimit 600
+}
 source [locate_data_file 51356_vase_creux.prt.3.gdml.tcl]
 

diff --git a/tests/boolean/gdml_private/ZK3 b/tests/boolean/gdml_private/ZK3
index 9ef8ed47afa33288973b2fd3b1d4ad0d771aaff5..378d3ec833bb92cb6d4d23de4f95771a1419cd9c 100644 (file)
--- a/tests/boolean/gdml_private/ZK3
+++ b/tests/boolean/gdml_private/ZK3
@@ -1,2 +1,5 @@
+if { [checkdebugmode] } {
+  cpulimit 1200
+}
 source [locate_data_file voile_3.asm.1.gdml.tcl]
 

diff --git a/tests/bugs/begin b/tests/bugs/begin
index 5427240b8a621d6dde0161831ea25958a916d849..98da719fe6fece8bb35c064951d78cf813309443 100755 (executable)
--- a/tests/bugs/begin
+++ b/tests/bugs/begin
@@ -14,9 +14,12 @@ set max_rel_tol_diff 0
 # On Windows with VC, in typical configuration gl2ps is built with Release
 # mode only which will fail in Debug mode; add TODO for that case in order
 # to handle it once for all tests that can use vexport command
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
     puts "TODO ?#23540 windows: Error: export of image.*failed"
     puts "TODO ?#23540 windows: Error: The file has been exported.*different size \[(\]0 "
+    puts "TODO ?#23540 windows: Error: Export to .+ file was done but size of file is incorrect"
+    puts "TODO ?#23540 windows: Error: Compare content of resulting .+ file with reference"
+    puts "TODO ?#23540 windows: Error: Update refsize if it's necessary"
 }
 
 if { [info exists imagedir] == 0 } {

diff --git a/tests/bugs/fclasses/bug26922 b/tests/bugs/fclasses/bug26922
index 362712f3da9f7b9cdba7f2984da25f1b268c979d..4608185e8910caa00bc5b274d433397e735ea386 100755 (executable)
--- a/tests/bugs/fclasses/bug26922
+++ b/tests/bugs/fclasses/bug26922
@@ -8,14 +8,14 @@ puts ""
 
 pload XDE
 
-if { [regexp {Debug mode} [dversion]] } {
-  if { [regexp {Windows} [dversion]] } {
-    set max_time 0.5
+if { [checkdebugmode] } {
+  if { [checkplatform -windows] } {
+    set max_time 1
   } else {
-    set max_time 0.5
+    set max_time 1
   }
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_time 0.5
   } else {
     set max_time 0.5

diff --git a/tests/bugs/fclasses/bug27114 b/tests/bugs/fclasses/bug27114
index 0e9e16652425cce4633149ee14ec2c4e88ae536d..ae7b55854579f0649a1512e41ae8dd2833b3ca31 100644 (file)
--- a/tests/bugs/fclasses/bug27114
+++ b/tests/bugs/fclasses/bug27114
@@ -11,8 +11,11 @@ restore [locate_data_file bug27114.brep] aShape
 explode aShape
 set anInfo [distmini d aShape_1 aShape_2]
 
+set solutions {}
+regexp {d_val (.+)\nOutput} $anInfo dump solutions
+
 # Check number of solutions
-if { [llength $anInfo] != 9 } {
+if { [llength ${solutions}] != 2 } {
     puts "ERROR: Incorrect number of solutions"
 } else {
  puts "OK: Two solutions is found"

diff --git a/tests/bugs/mesh/bug25364 b/tests/bugs/mesh/bug25364
index 0ef6bc404e9db03bc090c2209616ce15ce06ce22..a42246622d15db7dab48ae998473c6a80e7bf051 100755 (executable)
--- a/tests/bugs/mesh/bug25364
+++ b/tests/bugs/mesh/bug25364
@@ -72,7 +72,7 @@ set mem_delta_wsetpeak 220
 set mem_delta_virt 220
 set mem_delta_heap 80
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
    set mem_delta_swap 220
    set mem_delta_swappeak 350
    set mem_delta_wsetpeak 320

diff --git a/tests/bugs/mesh/bug25378_1_1 b/tests/bugs/mesh/bug25378_1_1
index 6036829a96f506fe1197cd0d1ae4241e8f5fdb0d..9410bb23e3c49639a8c014796473504b50088b2b 100755 (executable)
--- a/tests/bugs/mesh/bug25378_1_1
+++ b/tests/bugs/mesh/bug25378_1_1
@@ -20,10 +20,10 @@ set t_1 [expr [lindex [time {incmesh b 0.1}] 0]/1000000]
 puts "t_1=${t_1}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
     set max_t_1 20
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_1 0
   } else {
     set max_t_1 0

diff --git a/tests/bugs/mesh/bug25378_1_2 b/tests/bugs/mesh/bug25378_1_2
index 696e3a7f4b5702c7290f87409dd1b6df95a41d29..7c96baa3ed5e6195a6dd0b6cacb0f1ea29e002b2 100755 (executable)
--- a/tests/bugs/mesh/bug25378_1_2
+++ b/tests/bugs/mesh/bug25378_1_2
@@ -20,7 +20,7 @@ set t_01 [expr [lindex [time {incmesh b 0.01}] 0]/1000000]
 puts "t_01=${t_01}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   set max_t_01 180
 } else {
   set max_t_01 1

diff --git a/tests/bugs/mesh/bug25378_1_3 b/tests/bugs/mesh/bug25378_1_3
index fb834de728cf93045f0d991893cb567cfb4b1aec..8dd22826febd0e736472e24a7029342a555f378f 100755 (executable)
--- a/tests/bugs/mesh/bug25378_1_3
+++ b/tests/bugs/mesh/bug25378_1_3
@@ -20,11 +20,11 @@ set t_001 [expr [lindex [time {incmesh b 0.001}] 0]/1000000]
 puts "t_001=${t_001}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
     cpulimit 2000
     set max_t_001 600
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_001 189
   } else {
     set max_t_001 182

diff --git a/tests/bugs/mesh/bug25378_2_1 b/tests/bugs/mesh/bug25378_2_1
index d5c9aac8dd57727f9092b2316c462fe0725592d7..4e47c4444a96d18a7494a32ccc3c9d5108021a98 100644 (file)
--- a/tests/bugs/mesh/bug25378_2_1
+++ b/tests/bugs/mesh/bug25378_2_1
@@ -14,10 +14,10 @@ set t_1 [expr [lindex [time {incmesh b 0.1 -min 0.5}] 0]/1000000]
 puts "t_1=${t_1}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
     set max_t_1 5
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_1 1
   } else {
     set max_t_1 1

diff --git a/tests/bugs/mesh/bug25378_2_2 b/tests/bugs/mesh/bug25378_2_2
index 591d74f21f53fb4fd212bcbc1c5ee5799eb66dbe..5aaad53d95b27ecf267b07cbc4f0c37890f07fa5 100644 (file)
--- a/tests/bugs/mesh/bug25378_2_2
+++ b/tests/bugs/mesh/bug25378_2_2
@@ -14,10 +14,10 @@ set t_01 [expr [lindex [time {incmesh b 0.01 -min 0.1}] 0]/1000000]
 puts "t_01=${t_01}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode]} {
     set max_t_01 30
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_01 10
   } else {
     set max_t_01 25

diff --git a/tests/bugs/mesh/bug25378_2_3 b/tests/bugs/mesh/bug25378_2_3
index 217e0165390e55d6ef0cd91e764adaafbee22e14..1c6fa657e0f529d9a685c7c6ca77255cbaed81d1 100644 (file)
--- a/tests/bugs/mesh/bug25378_2_3
+++ b/tests/bugs/mesh/bug25378_2_3
@@ -14,10 +14,10 @@ set t_001 [expr [lindex [time {incmesh b 0.001 -min 1}] 0]/1000000]
 puts "t_001=${t_001}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
     set max_t_001 30
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_001 10
   } else {
     set max_t_001 15

diff --git a/tests/bugs/mesh/bug25378_3_1 b/tests/bugs/mesh/bug25378_3_1
index e21bea0f83f85532197841bf7e09f5539f8cd0af..caf6fb8430c5f07f4901a513f57216e2b1b7ebb1 100644 (file)
--- a/tests/bugs/mesh/bug25378_3_1
+++ b/tests/bugs/mesh/bug25378_3_1
@@ -14,10 +14,10 @@ set t_1 [expr [lindex [time {incmesh b 0.1}] 0]/1000000]
 puts "t_1=${t_1}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
     set max_t_1 3
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_1 1
   } else {
     set max_t_1 1

diff --git a/tests/bugs/mesh/bug25378_3_2 b/tests/bugs/mesh/bug25378_3_2
index b623c791892759ee2cbd2214f72a655b6b3388c0..4830ebb291a300b3e56ea1644667cb9b8b26a4a8 100644 (file)
--- a/tests/bugs/mesh/bug25378_3_2
+++ b/tests/bugs/mesh/bug25378_3_2
@@ -14,10 +14,10 @@ set t_01 [expr [lindex [time {incmesh b 0.01}] 0]/1000000]
 puts "t_01=${t_01}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode]} {
     set max_t_01 3
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_01 1
   } else {
     set max_t_01 4

diff --git a/tests/bugs/mesh/bug25378_3_3 b/tests/bugs/mesh/bug25378_3_3
index 45489a7f7ca5119203b3d0834256b23849097224..76bd65783318649023cd96f94aa40d018f8f8093 100644 (file)
--- a/tests/bugs/mesh/bug25378_3_3
+++ b/tests/bugs/mesh/bug25378_3_3
@@ -14,10 +14,10 @@ set t_001 [expr [lindex [time {incmesh b 0.001}] 0]/1000000]
 puts "t_001=${t_001}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
-    set max_t_001 50
+if { [checkdebugmode] } {
+    set max_t_001 120
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_001 30
   } else {
     set max_t_001 55

diff --git a/tests/bugs/mesh/bug25378_4_1 b/tests/bugs/mesh/bug25378_4_1
index 3c46a29f0eded401780be87dc60ec302f9f340d6..3607968bf5aac22717bf82a4961184125f36eb0d 100644 (file)
--- a/tests/bugs/mesh/bug25378_4_1
+++ b/tests/bugs/mesh/bug25378_4_1
@@ -14,10 +14,10 @@ set t_1 [expr [lindex [time {incmesh b 0.1 -min 0.5}] 0]/1000000]
 puts "t_1=${t_1}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
     set max_t_1 5
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_1 2
   } else {
     set max_t_1 2

diff --git a/tests/bugs/mesh/bug25378_4_2 b/tests/bugs/mesh/bug25378_4_2
index 523347f4ab0740ed1f77806b8b48f702865d4309..7e38c746a692f5334e96c38700cb2206b61cc822 100644 (file)
--- a/tests/bugs/mesh/bug25378_4_2
+++ b/tests/bugs/mesh/bug25378_4_2
@@ -14,10 +14,10 @@ set t_01 [expr [lindex [time {incmesh b 0.01 -min 0.1}] 0]/1000000]
 puts "t_01=${t_01}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode]} {
     set max_t_01 5
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_01 2
   } else {
     set max_t_01 2

diff --git a/tests/bugs/mesh/bug25378_4_3 b/tests/bugs/mesh/bug25378_4_3
index 5d91afe1f5e7f3934824497198fdf695f0c08461..e53f2287aab978fcde72f56811da67c5ebe8547c 100644 (file)
--- a/tests/bugs/mesh/bug25378_4_3
+++ b/tests/bugs/mesh/bug25378_4_3
@@ -14,10 +14,10 @@ set t_001 [expr [lindex [time {incmesh b 0.001 -min 1}] 0]/1000000]
 puts "t_001=${t_001}"
 trinfo b
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
     set max_t_001 5
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_t_001 2
   } else {
     set max_t_001 2

diff --git a/tests/bugs/modalg_5/bug24157_1 b/tests/bugs/modalg_5/bug24157_1
index ee09a4f9bf3d691fd9d1c744c7f78377c268c88d..af888f04e94c06c14a36b5578f95e61da1d07323 100644 (file)
--- a/tests/bugs/modalg_5/bug24157_1
+++ b/tests/bugs/modalg_5/bug24157_1
@@ -17,7 +17,7 @@ bfillds
 
 regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode]} {
   set check_time 150
 } else {
   set check_time 87

diff --git a/tests/bugs/modalg_5/bug24157_10 b/tests/bugs/modalg_5/bug24157_10
index cec4b7fb611112c7669674a37a883bb1849517ed..533ec204a047e99c5d342e8e6ee06897e5dcf3c4 100644 (file)
--- a/tests/bugs/modalg_5/bug24157_10
+++ b/tests/bugs/modalg_5/bug24157_10
@@ -82,7 +82,7 @@ bfillds
 
 regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   set check_time 20
 } else {
   set check_time 5

diff --git a/tests/bugs/modalg_5/bug24157_2 b/tests/bugs/modalg_5/bug24157_2
index 8e695a2a872ea79046e8aefb49955d5133e87a1d..bb49a28e5f5a55d902a3041f8c005b6115407994 100644 (file)
--- a/tests/bugs/modalg_5/bug24157_2
+++ b/tests/bugs/modalg_5/bug24157_2
@@ -20,7 +20,7 @@ bfillds
 
 regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   set check_time 2500
 } else {
   set check_time 378

diff --git a/tests/bugs/modalg_5/bug24157_3 b/tests/bugs/modalg_5/bug24157_3
index ed1f78ef117237e52431cd0ba23b7bc434c58c44..5d0fe9c5aaf990b38493608da29141011dbc2a23 100644 (file)
--- a/tests/bugs/modalg_5/bug24157_3
+++ b/tests/bugs/modalg_5/bug24157_3
@@ -14,7 +14,7 @@ bfillds
 
 regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   set check_time 50
 } else {
   set check_time 16

diff --git a/tests/bugs/modalg_5/bug24157_4 b/tests/bugs/modalg_5/bug24157_4
index 1f3474e0280547de1738e3bda71b5e7e14423a32..72b51b90709381772822b8aa38851b67562960db 100644 (file)
--- a/tests/bugs/modalg_5/bug24157_4
+++ b/tests/bugs/modalg_5/bug24157_4
@@ -59,7 +59,7 @@ bfillds
 
 regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   set check_time 60
 } else {
   set check_time 43

diff --git a/tests/bugs/modalg_5/bug24157_5 b/tests/bugs/modalg_5/bug24157_5
index 635573b91715dd7860cef8d80573900c8a363a72..6eea4b96ab19f2eb61a33daefdf954992f7880a9 100644 (file)
--- a/tests/bugs/modalg_5/bug24157_5
+++ b/tests/bugs/modalg_5/bug24157_5
@@ -65,7 +65,7 @@ bfillds
 
 regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   set check_time 50
 } else {
   set check_time 20

diff --git a/tests/bugs/modalg_5/bug24157_6 b/tests/bugs/modalg_5/bug24157_6
index c715625cf00986bd651b98290a1e97ef0552e5d4..d74af034d1bd2e4cdbada3bffd73b2539fda9a91 100644 (file)
--- a/tests/bugs/modalg_5/bug24157_6
+++ b/tests/bugs/modalg_5/bug24157_6
@@ -43,7 +43,7 @@ bfillds
 
 regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   set check_time 40
 } else {
   set check_time 24

diff --git a/tests/bugs/modalg_5/bug24157_7 b/tests/bugs/modalg_5/bug24157_7
index f7bebe4d7be9d38707451cc1e4a13a1af0271865..8ea877142bdb9cc6dc0544a93ad75bff255dd51a 100644 (file)
--- a/tests/bugs/modalg_5/bug24157_7
+++ b/tests/bugs/modalg_5/bug24157_7
@@ -43,7 +43,7 @@ bfillds
 
 regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   set check_time 200
 } else {
   set check_time 135

diff --git a/tests/bugs/modalg_5/bug24157_8 b/tests/bugs/modalg_5/bug24157_8
index 3d6848ee030c9187e07a380e9fb3a37e1e831fd5..8bd51620797c3d6ad2eeeb1520c22a44b7531b50 100644 (file)
--- a/tests/bugs/modalg_5/bug24157_8
+++ b/tests/bugs/modalg_5/bug24157_8
@@ -44,7 +44,7 @@ bfillds -t
 
 regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   set check_time 100
 } else {
   set check_time 15

diff --git a/tests/bugs/modalg_5/bug24157_9 b/tests/bugs/modalg_5/bug24157_9
index 538bf2f00f483362cf283f3b043c8bf49ca953b1..ed7a8a2e6c243fe4e2a6e7512ebf73e0626ee150 100644 (file)
--- a/tests/bugs/modalg_5/bug24157_9
+++ b/tests/bugs/modalg_5/bug24157_9
@@ -24,7 +24,7 @@ bfillds
 
 regexp { +Tps: +([-0-9.+eE]+)} [bbuild result -t] full tps_time
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   set check_time 280
 } else {
   set check_time 100

diff --git a/tests/bugs/modalg_5/bug24758_2 b/tests/bugs/modalg_5/bug24758_2
index 64e5d8cd2cbe50d1e667b30b82916512d4c3c59f..69e8bd2ead0da3c3ff4639a293fb3526bfe71133 100644 (file)
--- a/tests/bugs/modalg_5/bug24758_2
+++ b/tests/bugs/modalg_5/bug24758_2
@@ -6,7 +6,7 @@ puts ""
 # Sample Draw scripts for demonstrating sweeping algorithm
 ##############################################################
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
    cpulimit 3000
 }
 

diff --git a/tests/bugs/modalg_6/bug26567 b/tests/bugs/modalg_6/bug26567
index 9e6e56758925ce666dcc84c0d589738fc86a452e..de39c01ac5877ac00156023af49432f8d24b38fa 100644 (file)
--- a/tests/bugs/modalg_6/bug26567
+++ b/tests/bugs/modalg_6/bug26567
@@ -6,8 +6,11 @@ puts ""
 ## Exception in Boolean intersection command
 ###############################
 
-cpulimit 1000
-
+if { [checkdebugmode] } {
+  cpulimit 2400
+} else {
+  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

diff --git a/tests/bugs/modalg_6/bug27021 b/tests/bugs/modalg_6/bug27021
index 082a33dc76b29ded877e566d0483793e8a576965..026ce1454efb0ee326b4dcfa00f39de36fe353c0 100644 (file)
--- a/tests/bugs/modalg_6/bug27021
+++ b/tests/bugs/modalg_6/bug27021
@@ -8,16 +8,16 @@ puts ""
 
 pload QAcommands
 
-if { [regexp {Debug mode} [dversion]] } {
-  if { [regexp {Windows} [dversion]] } {
-    set max_time 8.
-    set max_time2 5.
+if { [checkdebugmode] } {
+  if { [checkplatform -windows] } {
+    set max_time 180.
+    set max_time2 120.
   } else {
     set max_time 8.
     set max_time2 5.
   }
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_time 8.
     set max_time2 5.
   } else {
@@ -41,7 +41,7 @@ if { ${A_sec} > ${max_time} } {
 }
 
 if { ${B_sec} > ${max_time2} } {                                         
-    puts "Retrieving 100000000 vertices using approach A) is more than ${max_time2} seconds - Faulty"
+    puts "Retrieving 100000000 vertices using approach B) is more than ${max_time2} seconds - Faulty"
 } else {
-    puts "Retrieving 100000000 vertices using approach A) is less than ${max_time2} seconds - OK"
+    puts "Retrieving 100000000 vertices using approach B) is less than ${max_time2} seconds - OK"
 }

diff --git a/tests/bugs/modalg_6/bug27033 b/tests/bugs/modalg_6/bug27033
index c2d05b2822f7c514e98bc1022bbd46c11bcb4b76..ae1d085da14649a610b9e6456d8e4a25359b29db 100644 (file)
--- a/tests/bugs/modalg_6/bug27033
+++ b/tests/bugs/modalg_6/bug27033
@@ -5,7 +5,9 @@ puts ""
 #############################################################
 # Modeling -- ensure stable result of area calculation
 #############################################################
-
+if { [checkdebugmode] } {
+  cpulimit 2400
+}
 pload XDE
 stepread [locate_data_file OCC11856.stp] a *
 

diff --git a/tests/bugs/moddata_1/bug152_1 b/tests/bugs/moddata_1/bug152_1
index d42fb21e9acc01ae1c75a999d75eb61e359ed7e3..1ced1102cab35463c65646e4fdd84115da8fe4bb 100755 (executable)
--- a/tests/bugs/moddata_1/bug152_1
+++ b/tests/bugs/moddata_1/bug152_1
@@ -1,9 +1,5 @@
 puts "TODO OCC22033 ALL: Error : The area of result shape is"
 puts "TODO OCC22033 ALL: Faulty shapes in variables faulty_1 to faulty_"
-if { [regexp {Debug mode} [dversion]] } {
-  puts "TODO OCC22033 ALL: TEST INCOMPLETE"
-  puts "TODO OCC22033 ALL: Exception"
-}
 
 puts "================"
 puts "OCC152"

diff --git a/tests/bugs/moddata_1/bug152_2 b/tests/bugs/moddata_1/bug152_2
index cecc8a21bba57a3559c9a05591813a8958964879..23d3339f3a1ca3211415aa474667777825f598c0 100755 (executable)
--- a/tests/bugs/moddata_1/bug152_2
+++ b/tests/bugs/moddata_1/bug152_2
@@ -1,8 +1,4 @@
 puts "TODO OCC22033 ALL: Faulty shapes in variables faulty_1 to faulty_"
-if { [regexp {Debug mode} [dversion]] } {
-  puts "TODO OCC22033 ALL: TEST INCOMPLETE"
-  puts "TODO OCC22033 ALL: Exception"
-}
 
 puts "================"
 puts "OCC152"

diff --git a/tests/bugs/moddata_3/bug25179 b/tests/bugs/moddata_3/bug25179
index b8aff0be968aa75cc51e7d53364c44ea778fc0d0..26571ae9235fb99f7ab962c42a45f17b67bc6ced 100755 (executable)
--- a/tests/bugs/moddata_3/bug25179
+++ b/tests/bugs/moddata_3/bug25179
@@ -6,7 +6,7 @@ puts ""
 # BRepMesh cannot build a mesh on specific geometry
 ###################################################################################
 
-cpulimit 2000
+cpulimit 3600
 
 restore [locate_data_file bug25179_nurbs-with-partial-seam.brep] result
 

diff --git a/tests/bugs/moddata_3/bug27565 b/tests/bugs/moddata_3/bug27565
index 84486ea763cee719bf82c297df20cf3b8787ffd8..81c74a261c40b9d172451e74d447284e403f7204 100644 (file)
--- a/tests/bugs/moddata_3/bug27565
+++ b/tests/bugs/moddata_3/bug27565
@@ -11,7 +11,10 @@ explode a
 
 # Test number of solutions in a result.
 set info [distmini d a_1 a_2 1.0]
-if { [llength $info] != 9 } {
+regexp {d_val (.+)\nOutput} $info dump solutions
+
+if { ![info exists solutions] ||
+      [llength ${solutions}] != 2 } {
     puts "Error : Extrema is wrong"
 } else {
     puts "OK: Extrema is valid"

diff --git a/tests/bugs/moddata_3/bug28182 b/tests/bugs/moddata_3/bug28182
index d4df323a49bc0921ad25fdcb50e0628014c65bdb..9edeefe32d1cc96f12c87c71021502168ed2be2f 100644 (file)
--- a/tests/bugs/moddata_3/bug28182
+++ b/tests/bugs/moddata_3/bug28182
@@ -18,7 +18,7 @@ set defl 0.0001
 
 set res [distmini r s_198 b $defl]
 
-set redges [lrange [lindex [split $res \n] 1] 1 end]
+regexp {r_val (.+)\nOutput} $res dump redges
 set nbsol [llength $redges]
 set dist [dval r_val]
 

diff --git a/tests/bugs/moddata_3/bug28183 b/tests/bugs/moddata_3/bug28183
index ecaace3f4b8a35e3b9a263d18eef0f3b5b166976..9b0244260399207888baaf703925f64b49344c85 100644 (file)
--- a/tests/bugs/moddata_3/bug28183
+++ b/tests/bugs/moddata_3/bug28183
@@ -18,7 +18,7 @@ set ref_dist 1e-7
 
 # find extremum points
 set res [distmini r s_511 b_2]
-set redges [lrange [lindex [split $res \n] 1] 1 end]
+regexp {r_val (.+)\nOutput} $res dump redges
 set nbsol [llength $redges]
 set dist [dval r_val]
 

diff --git a/tests/bugs/parse.rules b/tests/bugs/parse.rules
index 9d0907f3c04e489ea1ec96a77f2fc37c87d394be..0f450ee86a3e80faa84bc7e33d12597e89bc68cb 100755 (executable)
--- a/tests/bugs/parse.rules
+++ b/tests/bugs/parse.rules
@@ -2,3 +2,12 @@ FAILED /\bFaulty\b/ bad shape
 FAILED /failure reading attribute/ attribute failure
 SKIPPED /Error: unsupported locale specification/ locale is unavailable on tested system
 OK /Relative error of mass computation/ message from vprops
+IGNORE /DEBUG: [*]+\s+Error on Record [0-9]+ \(on [0-9]+ -> [0-9]+ % in File\)\s+[*]+\s+Ident .[0-9]+/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: [*]+\s+StepFile Error : At line [0-9]+, syntax error\s+[*]+/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: --- BRepCheck Wire: Closed3d -> Error/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Approximation error :/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Criterium error :/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error [23]d =/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Other Error in Make STEP wire/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error: ShapeProcess_Performer::Perform: sequence not defined for Seq/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: iteration = [0-9.e+-]+\terror = [0-9.e+-]+\tspans = [0-9.e+-]+/ extended messages of OCCT algorithms only for Debug configuration

diff --git a/tests/bugs/step/bug2368 b/tests/bugs/step/bug2368
index 8238037a77624aba23737063489cd8e5072c88d1..2c87f2034e735931112c4167934aae7855728420 100644 (file)
--- a/tests/bugs/step/bug2368
+++ b/tests/bugs/step/bug2368
@@ -6,10 +6,4 @@ puts ""
 # Exeption is raised in the application during reading attached IGES file.
 ######################################################
 
-set list [stepread [locate_data_file OCC2368.stp] a *]
-if {[lsearch ${list} Error] > -1} {
-    puts "OCC2368: Error during reading attached IGES file"
-} else {
-    puts "OCC2368: OK"
-}
-
+stepread [locate_data_file OCC2368.stp] a *

diff --git a/tests/bugs/vis/bug26139 b/tests/bugs/vis/bug26139
index 6a9ac7defde33585ea6fcf755d1f511753fe3acc..e7718614ca69c4869795527b27678e56f964b408 100644 (file)
--- a/tests/bugs/vis/bug26139
+++ b/tests/bugs/vis/bug26139
@@ -11,5 +11,9 @@ puts "AIS_InteractiveContext::Display performance regression"
 pload VISUALIZATION
 pload QAcommands
 
+if { [checkdebugmode] } {
+  cpulimit 3000
+}
+
 vinit View1
 OCC26139

diff --git a/tests/bugs/vis/bug26199 b/tests/bugs/vis/bug26199
index 54eab94495941842d24a85fc8758bdaf924b03c1..d67d7739be040219e0d4760b653cee984dad0bde 100644 (file)
--- a/tests/bugs/vis/bug26199
+++ b/tests/bugs/vis/bug26199
@@ -39,8 +39,8 @@ puts "vclear done in $d2 microseconds!\n"
 set t1_sec [expr $d1 * 1.e-6]
 set t2_sec [expr $d2 * 1.e-6]
 
-if { [regexp {Debug mode} [dversion]] } {
-  if { [regexp {Windows} [dversion]] } {
+if { [checkdebugmode] } {
+  if { [checkplatform -windows] } {
     set max_time_vconnectto 5
     set max_time_vclear 5
   } else {
@@ -48,7 +48,7 @@ if { [regexp {Debug mode} [dversion]] } {
     set max_time_vclear 5
   }
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_time_vconnectto 1
     set max_time_vclear 1
   } else {

diff --git a/tests/chamfer/parse.rules b/tests/chamfer/parse.rules
index 610d206403a4e305f0f5f27739724400719f8b5b..d571114d1fa04bf60788c214d570180b285d55c6 100644 (file)
--- a/tests/chamfer/parse.rules
+++ b/tests/chamfer/parse.rules
@@ -1 +1,4 @@
 FAILED /\bFaulty\b/ bad shape
+IGNORE /DEBUG: Approximation error :/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Criterium error :/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error [23]d =/ extended messages of OCCT algorithms only for Debug configuration
\ No newline at end of file

diff --git a/tests/de/begin b/tests/de/begin
index 20204e3741bd016e0ba6e29a8aa5b3fed16da670..6bdbef3d17c803c9c75e527f66cced4fafcd62d6 100644 (file)
--- a/tests/de/begin
+++ b/tests/de/begin
@@ -2,7 +2,11 @@ pload DCAF
 pload TOPTEST
 pload XDE
 
-cpulimit 2500
+if {[checkdebugmode]} {
+  cpulimit 5000
+} else {
+  cpulimit 2500
+}
 
 # Create a new document and set UndoLimit
 NewDocument D BinXCAF

diff --git a/tests/de/parse.rules b/tests/de/parse.rules
index 813616d1cfc5c70ce08cb5e55de1e5e08c761a0e..72f01342708051a6302d43d13472ddec4892a4a6 100644 (file)
--- a/tests/de/parse.rules
+++ b/tests/de/parse.rules
@@ -8,4 +8,10 @@ IGNORE /StepFile Error/ message during loading step file
 IGNORE /StepToTopoDS, GeometricSet/exception
 IGNORE /OSD_Exception_ACCESS_VIOLATION/ exception during reading step
 IGNORE /Exception Raised while reading Step File/ exception during reading step file
-IGNORE /Warning: ShapeFix_.* Exception/ internal exceptions caught by FixShape
\ No newline at end of file
+IGNORE /Warning: ShapeFix_.* Exception/ internal exceptions caught by FixShape
+IGNORE /DEBUG: [*]+\s+Error on Record [0-9]+ \(on [0-9]+ -> [0-9]+ % in File\)\s+[*]+\s+Ident .[0-9]+/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error : curve 2d range crossing non periodic curve origin/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Warning: ShapeFix_WireSegment::DefineI[UV]M[inax]+: indexation error/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error: STEPCAFControl_Reader::FindInstance: NAUO is not mapped to shape/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error: ShapeFix_ComposeShell::SplitByLine: parity error/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error: color name .+ is not recognized/ extended messages of OCCT algorithms only for Debug configuration

diff --git a/tests/demo/parse.rules b/tests/demo/parse.rules
index 0d2b3c3ef39eb8b547b9c1cb9a05bb1daf2fd4b3..1c77a0fc406b1c47b249ee3a8810439894dd1d9f 100644 (file)
--- a/tests/demo/parse.rules
+++ b/tests/demo/parse.rules
@@ -1,2 +1,3 @@
 OK     /Wanted exception/ intentionally generated exception
 FAILED /Failure message/ artificial failure
+IGNORE /DEBUG: Error [23]d =/ extended messages of OCCT algorithms only for Debug configuration
\ No newline at end of file

diff --git a/tests/heal/data/advanced/ZE8 b/tests/heal/data/advanced/ZE8
index 4b10e868caeb0515cf5193ebad2e0761af87298e..57418e008f643df260f1b74ce748a10f66afa31d 100644 (file)
--- a/tests/heal/data/advanced/ZE8
+++ b/tests/heal/data/advanced/ZE8
@@ -1,6 +1,9 @@
 if {[string compare $command "SplitAngle"] == 0 } {
   puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
 }
+if { [checkdebugmode] } {
+  cpulimit 900
+}
 
 restore [locate_data_file BPLSEITLI.brep] a
 

diff --git a/tests/heal/data/advanced/ZE9 b/tests/heal/data/advanced/ZE9
index 627c0372806a1280a5c40352de0728711d7de7cc..cd13e105674d6ab331990413888d856fb9509f48 100644 (file)
--- a/tests/heal/data/advanced/ZE9
+++ b/tests/heal/data/advanced/ZE9
@@ -1,6 +1,9 @@
 if {[string compare $command "SplitAngle"] == 0 } {
     puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_28 "
 }
+if { [checkdebugmode] } {
+  cpulimit 900
+}
 
 restore [locate_data_file BPLSEITRE.brep] a
 

diff --git a/tests/heal/fix_face_size/parse.rules b/tests/heal/fix_face_size/parse.rules
new file mode 100644 (file)
index 0000000..cd009f5
--- /dev/null
+++ b/tests/heal/fix_face_size/parse.rules
@@ -0,0 +1 @@
+IGNORE /DEBUG: iteration = [0-9.e+-]+\terror = [0-9.e+-]+\tspans = [0-9.e+-]+/ extended messages of OCCT algorithms only for Debug configuration

diff --git a/tests/heal/parse.rules b/tests/heal/parse.rules
index 610d206403a4e305f0f5f27739724400719f8b5b..959301d447ead46fdd20db54addd71075b503a24 100644 (file)
--- a/tests/heal/parse.rules
+++ b/tests/heal/parse.rules
@@ -1 +1,7 @@
 FAILED /\bFaulty\b/ bad shape
+IGNORE /DEBUG:\terror = [0-9.e+-]+\tspans = [0-9.e+-]+/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error: ShapeProcess_Performer::Perform: sequence not defined for Seq/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: iteration = [0-9.e+-]+\terror = [0-9.e+-]+\tspans = [0-9.e+-]+/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Warning: ShapeFix_WireSegment::DefineI[UV]M[inax]+: indexation error/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error: Number of intervals are not equal for 2d 3d[.] Ignored[.]/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error: ShapeFix_ComposeShell::MakeFacesOnPatch: can\'t dispatch wires/ extended messages of OCCT algorithms only for Debug configuration
\ No newline at end of file

diff --git a/tests/heal/wire_tails_real/A5 b/tests/heal/wire_tails_real/A5
index 8cbda82dc60586feb831dffab0fc7243257e2ae7..2851dfa1fb20e69fa29935773b62320a677f6e98 100644 (file)
--- a/tests/heal/wire_tails_real/A5
+++ b/tests/heal/wire_tails_real/A5
@@ -1,5 +1,9 @@
 pload XDE
 
+if { [checkdebugmode] } {
+  cpulimit 1200
+}
+
 stepread [locate_data_file bug26261_ca07771-040x.stp] s *
 renamevar s_1 s
 fixshape  r  s  -maxtaila 1  -maxtailw 1e-3

diff --git a/tests/heal/wire_tails_real/A7 b/tests/heal/wire_tails_real/A7
index bcfb3b70fb8f363ed0a5e0e5d8dce7974120de71..b3f85e572804612f6a263f77aed175ea2293d8e0 100644 (file)
--- a/tests/heal/wire_tails_real/A7
+++ b/tests/heal/wire_tails_real/A7
@@ -1,5 +1,9 @@
 pload XDE
 
+if { [checkdebugmode] } {
+  cpulimit 600
+}
+
 stepread [locate_data_file bug26261_mmg-m-cv-qubit.stp] s *
 renamevar s_1 s
 fixshape  r  s  1e-3  1  -maxtaila 6  -maxtailw 1e-3

diff --git a/tests/mesh/parse.rules b/tests/mesh/parse.rules
new file mode 100644 (file)
index 0000000..05d5b39
--- /dev/null
+++ b/tests/mesh/parse.rules
@@ -0,0 +1 @@
+IGNORE /DEBUG: Error 3d =/ extended messages of OCCT algorithms only for Debug configuration
\ No newline at end of file

diff --git a/tests/mkface/edges_to_faces/D5 b/tests/mkface/edges_to_faces/D5
index 8587b9924a944c4849e7e005d9a56314011f6d26..6bc2b7fa67e07390e7495ce58c7ea71ded5e3ea6 100644 (file)
--- a/tests/mkface/edges_to_faces/D5
+++ b/tests/mkface/edges_to_faces/D5
@@ -5,6 +5,9 @@ puts ""
 #################################################
 # Implementation of the EdgesToFaces function
 #################################################
+if { [checkdebugmode] } {
+  cpulimit 900
+}
 
 restore [locate_data_file bug28284.brep] s
 eval compound [explode s e] c

diff --git a/tests/offset/parse.rules b/tests/offset/parse.rules
index 95a93927e0d980d2beb378aae749997638b0e2db..615413308d3edef4e5a64f1eb28d87ff79dc79f3 100644 (file)
--- a/tests/offset/parse.rules
+++ b/tests/offset/parse.rules
@@ -1,2 +1,3 @@
 FAILED /\bFaulty\b/ bad shape
-OK /Relative error of mass computation/ message from vprops
\ No newline at end of file
+OK /Relative error of mass computation/ message from vprops
+IGNORE /DEBUG: Error 3d =/ extended messages of OCCT algorithms only for Debug configuration

diff --git a/tests/offset/wire_unclosed_outside_0_025/B9 b/tests/offset/wire_unclosed_outside_0_025/B9
index 0fef76531830ea67552f94d224b63015de3eb35d..24d057f5f5168728960cc207bc5cd7a5289854c3 100644 (file)
--- a/tests/offset/wire_unclosed_outside_0_025/B9
+++ b/tests/offset/wire_unclosed_outside_0_025/B9
@@ -1,6 +1,10 @@
 puts "TODO OCC24255 ALL: Faulty shapes in variables faulty_1 to faulty_" 
 puts "TODO OCC24255 ALL: Error : big tolerance of shape result"
 
+if { [checkdebugmode] } {
+  cpulimit 1500
+}
+
 restore [locate_data_file offset_wire_071.brep] s
 
 set length 121794

diff --git a/tests/perf/bspline/intersect b/tests/perf/bspline/intersect
index 4e3f797bb5ade21d7862764dddb466deb5305243..75c6bc7d5ed85d47e93b98dfc86ea8ba338b2623 100644 (file)
--- a/tests/perf/bspline/intersect
+++ b/tests/perf/bspline/intersect
@@ -1,6 +1,6 @@
 # Test performance of intersection of several NURBS surfaces
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
    cpulimit 1000
 } else {
    cpulimit 500

diff --git a/tests/perf/heal/bug24596_1 b/tests/perf/heal/bug24596_1
index aa242c8aa4b418f35df324f18bf75e6e5bfe807f..af9955b56e06e6d09c1e0c77ebb7e3c9f315578f 100644 (file)
--- a/tests/perf/heal/bug24596_1
+++ b/tests/perf/heal/bug24596_1
@@ -8,7 +8,7 @@ puts ""
 
 pload QAcommands
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   cpulimit 8500
 } else {
   cpulimit 2600

diff --git a/tests/perf/heal/bug24596_2 b/tests/perf/heal/bug24596_2
index aeedf833d1334f48223c016d20de4c8cc074e750..46827446effe6b4fd73d318d4a113c6ee50d88b4 100644 (file)
--- a/tests/perf/heal/bug24596_2
+++ b/tests/perf/heal/bug24596_2
@@ -8,7 +8,7 @@ puts ""
 
 pload QAcommands
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
   cpulimit 8500
 } else {
   cpulimit 2600

diff --git a/tests/perf/modalg/bug25742_2 b/tests/perf/modalg/bug25742_2
index f636f2683c9689ab5a7abaa5311c6a34077e0ecb..0f2f6ac3a54a832e986e8f696baffef378f89512 100755 (executable)
--- a/tests/perf/modalg/bug25742_2
+++ b/tests/perf/modalg/bug25742_2
@@ -6,8 +6,8 @@ puts ""
 ## A partition of 2 shapes stresses a performance issue
 ###############################
 
-if { [regexp {Debug mode} [dversion]] } {
-  if { [regexp {Windows} [dversion]] } {
+if { [checkdebugmode] } {
+  if { [checkplatform -windows] } {
     set max_time 10
     set max_time2 10
   } else {
@@ -15,7 +15,7 @@ if { [regexp {Debug mode} [dversion]] } {
     set max_time2 10
   }
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_time 1
     set max_time2 1
   } else {

diff --git a/tests/perf/modalg/bug26310_1 b/tests/perf/modalg/bug26310_1
index 826d18203b60b13b104b07204c7ae9d50b5a3c53..0c280b70a49604d02302bd422b895fb3c6114964 100644 (file)
--- a/tests/perf/modalg/bug26310_1
+++ b/tests/perf/modalg/bug26310_1
@@ -6,7 +6,7 @@ puts ""
 # Very slow boolean cut operations on cylinders
 #################################################
 
-if { [regexp {Debug mode} [dversion]] } {
+if { [checkdebugmode] } {
     set max_time 0.3
 } else {
     set max_time 0.15

diff --git a/tests/perf/modalg/bug26980 b/tests/perf/modalg/bug26980
index 997bce58eed944c5b07fc3ab91bceef04e65dd08..28580166248f6e916445a3dee3cee80dfe959060 100644 (file)
--- a/tests/perf/modalg/bug26980
+++ b/tests/perf/modalg/bug26980
@@ -6,6 +6,10 @@ puts ""
 # Intersection part of Boolean algorithm spends much system time and system memory
 #################################
 
+if { [checkdebugmode] } {
+  cpulimit 2000
+}
+
 set max_time 130
 set mem_max_wsetpeak 500000000
 

diff --git a/tests/perf/moddata/bug26339 b/tests/perf/moddata/bug26339
index 267a1f5d98d9d1aa3e9a2514386caf374716e3a2..7980c05b33f728ef04892aee605b08253c119435 100644 (file)
--- a/tests/perf/moddata/bug26339
+++ b/tests/perf/moddata/bug26339
@@ -6,14 +6,14 @@ puts ""
 # [Regression in 6.9.0] Projecting a curve hangs
 #######################################################################
 
-if { [regexp {Debug mode} [dversion]] } {
-  if { [regexp {Windows} [dversion]] } {
+if { [checkdebugmode] } {
+  if { [checkplatform -windows] } {
     set max_time 10
   } else {
     set max_time 10
   }
 } else {
-  if { [regexp {Windows} [dversion]] } {
+  if { [checkplatform -windows] } {
     set max_time 3
   } else {
     set max_time 3

diff --git a/tests/perf/ncollection/A1 b/tests/perf/ncollection/A1
index 9c5092447355917862fec58aea67a3d58aa32764..2fddd4443e31e05984c3d3302c47bd62089a112d 100644 (file)
--- a/tests/perf/ncollection/A1
+++ b/tests/perf/ncollection/A1
@@ -57,7 +57,7 @@ set index 0
 foreach key $keys {
   set value [lindex $values $index]
   if { $value > [lindex $check_values $index] } {
-    puts "Error: performance of $key become worse"
+    puts "${conf}ERROR: performance of $key become worse"
   } else {
     puts "OK: performance of $key is OK"
   }

diff --git a/tests/perf/ncollection/A2 b/tests/perf/ncollection/A2
index 98bd0c69155c26687334c8ef2701d4014c22264d..6491a4f1c811cc0c8c57a00eafcb2964dfb09a0d 100644 (file)
--- a/tests/perf/ncollection/A2
+++ b/tests/perf/ncollection/A2
@@ -33,7 +33,7 @@ set index 0
 foreach key $keys {
   set value [lindex $values $index]
   if { $value > [lindex $check_values $index] } {
-    puts "ERROR: performance of $key become worse"
+    puts "${conf}ERROR: performance of $key become worse"
   } else {
     puts "OK: performance of $key is OK"
   }

diff --git a/tests/perf/ncollection/A3 b/tests/perf/ncollection/A3
index fb45495fa31225fb8e920830844d12d2f89b7385..44a091991c2000793ed4f9b55f09dd44e2db0513 100644 (file)
--- a/tests/perf/ncollection/A3
+++ b/tests/perf/ncollection/A3
@@ -33,7 +33,7 @@ set index 0
 foreach key $keys {
   set value [lindex $values $index]
   if { $value > [lindex $check_values $index] } {
-    puts "ERROR: performance of $key become worse"
+    puts "${conf}ERROR: performance of $key become worse"
   } else {
     puts "OK: performance of $key is OK"
   }

diff --git a/tests/perf/ncollection/begin b/tests/perf/ncollection/begin
new file mode 100644 (file)
index 0000000..c225862
--- /dev/null
+++ b/tests/perf/ncollection/begin
@@ -0,0 +1,4 @@
+set conf ""
+if { [checkdebugmode] } {
+    set conf "DEBUG: "
+}

diff --git a/tests/perf/parse.rules b/tests/perf/parse.rules
index 610d206403a4e305f0f5f27739724400719f8b5b..4a027f1f72b87a317fb1f9dda9dcf3dc62cf0f85 100644 (file)
--- a/tests/perf/parse.rules
+++ b/tests/perf/parse.rules
@@ -1 +1,6 @@
 FAILED /\bFaulty\b/ bad shape
+IGNORE /DEBUG: Approximation error :/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Criterium error :/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error [23]d =/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: Error: ShapeFix_ComposeShell::MakeFacesOnPatch: can\'t dispatch wires/ extended messages of OCCT algorithms only for Debug configuration
+IGNORE /DEBUG: ERROR: performance of .+ become worse/ do not check performance for Debug configuration
\ No newline at end of file

diff --git a/tests/pipe/parse.rules b/tests/pipe/parse.rules
index 95a93927e0d980d2beb378aae749997638b0e2db..1c42e8e76eff5ae6b139eb5fb0d53c3136bd6d6e 100644 (file)
--- a/tests/pipe/parse.rules
+++ b/tests/pipe/parse.rules
@@ -1,2 +1,3 @@
 FAILED /\bFaulty\b/ bad shape
-OK /Relative error of mass computation/ message from vprops
\ No newline at end of file
+OK /Relative error of mass computation/ message from vprops
+IGNORE /DEBUG: Error 3d =/ extended messages of OCCT algorithms only for Debug configuration
\ No newline at end of file

diff --git a/tests/prj/base/I3 b/tests/prj/base/I3
index 06fa5d97413d50d9b6bb68a2f346fa563fe981bc..50cd670c0b0052bf875e6e3e72fa164702427c7d 100644 (file)
--- a/tests/prj/base/I3
+++ b/tests/prj/base/I3
@@ -1,3 +1,6 @@
+if { [checkdebugmode] } {
+  cpulimit 200
+}
 restore [locate_data_file bug26606_007_extract_2015-01-7108_001_offset.brep] plate
 restore [locate_data_file bug26606_007_extract_2015-01-7108_019_marker_1.brep] marker
 set prlist [prj pr marker plate -0.273655 -0.811157 0.516852]
\ No newline at end of file

diff --git a/tests/thrusection/parse.rules b/tests/thrusection/parse.rules
index 95a93927e0d980d2beb378aae749997638b0e2db..1c42e8e76eff5ae6b139eb5fb0d53c3136bd6d6e 100644 (file)
--- a/tests/thrusection/parse.rules
+++ b/tests/thrusection/parse.rules
@@ -1,2 +1,3 @@
 FAILED /\bFaulty\b/ bad shape
-OK /Relative error of mass computation/ message from vprops
\ No newline at end of file
+OK /Relative error of mass computation/ message from vprops
+IGNORE /DEBUG: Error 3d =/ extended messages of OCCT algorithms only for Debug configuration
\ No newline at end of file

diff --git a/tests/xcaf/parse.rules b/tests/xcaf/parse.rules
index 22891c8f97f5ea4e5d602ce1374390439785f4ea..1af4e3fa623e39d3221cdc95916b0a9f1d6152da 100644 (file)
--- a/tests/xcaf/parse.rules
+++ b/tests/xcaf/parse.rules
@@ -1 +1,2 @@
 IGNORE /Error: STEPCAFControl_Reader::FindInstance: NAUO is not mapped to shape/ bad file in xcaf stp_to_dxc C5
+IGNORE /DEBUG: [*]+\s+Error on Record [0-9]+ \(on [0-9]+ -> [0-9]+ % in File\)\s+[*]+\s+Ident .[0-9]+/ extended messages of OCCT algorithms only for Debug configuration
\ No newline at end of file