diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
index 1323bfac13..9ef45aaf16 100644
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
@@ -143,7 +143,7 @@ Handle(Geom2d_Curve) BRepBuilderAPI_Sewing::SameRange(const Handle(Geom2d_Curve)
RequestedFirst,RequestedLast,NewCurvePtr);
}
catch (Standard_Failure) {
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "Exception in BRepBuilderAPI_Sewing::SameRange: ";
Standard_Failure::Caught()->Print(cout); cout << endl;
#endif
@@ -315,7 +315,7 @@ void BRepBuilderAPI_Sewing::SameParameter(const TopoDS_Edge& edge) const
BRepLib::SameParameter(edge);
}
catch (Standard_Failure) {
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "Exception in BRepBuilderAPI_Sewing::SameParameter: ";
Standard_Failure::Caught()->Print(cout); cout << endl;
#endif
@@ -2260,7 +2260,7 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
Standard_Real first, last;
Handle(Geom_Curve) c3d = BRep_Tool::Curve(edge,first,last);
if (c3d.IsNull()) {
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "Warning: Possibly small edge can be sewed: No 3D curve" << endl;
#endif
}
@@ -2340,7 +2340,7 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
// Replace small edge
if (isSmall) {
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "Warning: Small edge made degenerated by FaceAnalysis" << endl;
#endif
nbSmall++;
@@ -2377,7 +2377,7 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
// Remove small face
if (nbSmall == nbEdges) {
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "Warning: Small face removed by FaceAnalysis" << endl;
#endif
myLittleFace.Add(face);
@@ -2765,7 +2765,7 @@ static Standard_Boolean GlueVertices(TopTools_IndexedDataMapOfShapeShape& aVerte
}
}
Standard_Integer nbNodes = NodeVertices.Extent();
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "Glueing " << nbNodes << " nodes..." << endl;
#endif
// Merge nearest nodes
@@ -2926,7 +2926,7 @@ void BRepBuilderAPI_Sewing::VerticesAssembling(const Handle(Message_ProgressIndi
}
// Glue vertices
if (nbVert) {
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "Assemble " << nbVert << " vertices on faces..." << endl;
#endif
while (GlueVertices(myVertexNode,myNodeSections,myBoundFaces,myTolerance, thePI));
@@ -2935,7 +2935,7 @@ void BRepBuilderAPI_Sewing::VerticesAssembling(const Handle(Message_ProgressIndi
return;
aPS.Next();
if (nbVertFree) {
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "Assemble " << nbVertFree << " vertices on floating edges..." << endl;
#endif
while (GlueVertices(myVertexNodeFree,myNodeSections,myBoundFaces,myTolerance, thePI));
@@ -3689,7 +3689,7 @@ void BRepBuilderAPI_Sewing::Cutting(const Handle(Message_ProgressIndicator)& the
myBoundSections.Bind(bound,listSections);
}
}
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "From " << nbBounds << " bounds " << myBoundSections.Extent()
<< " were cut into " << mySectionBound.Extent() << " sections" << endl;
#endif
@@ -4294,7 +4294,7 @@ void BRepBuilderAPI_Sewing::ProjectPointsOnCurve(const TColgp_Array1OfPnt& arrPn
}
catch (Standard_Failure) {
worktol = MinTolerance();
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "Exception in BRepBuilderAPI_Sewing::ProjectPointsOnCurve: ";
Standard_Failure::Caught()->Print(cout); cout << endl;
#endif
@@ -4674,7 +4674,7 @@ void BRepBuilderAPI_Sewing::SameParameterShape()
BRepLib::SameParameter(sec, BRep_Tool::Tolerance(sec));
}
catch (Standard_Failure) {
-#ifdef DEB
+#ifdef BREPBUILDERAPI_DEB
cout << "Fail: BRepBuilderAPI_Sewing::SameParameterShape exception in BRepLib::SameParameter" << endl;
#endif
continue;
diff --git a/src/BRepCheck/BRepCheck_Wire.cxx b/src/BRepCheck/BRepCheck_Wire.cxx
index e10c0929bb..1415011d23 100644
--- a/src/BRepCheck/BRepCheck_Wire.cxx
+++ b/src/BRepCheck/BRepCheck_Wire.cxx
@@ -371,8 +371,7 @@ BRepCheck_Status BRepCheck_Wire::Closed(const Standard_Boolean Update)
//purpose : Return Standard_True if distance between thePnt_f and
// thePnt_l is not more, than aTol3d
//=======================================================================
-Standard_Boolean IsDistanceIn3DTolerance (const BRepAdaptor_Surface& /*aFaceSurface*/,
- const gp_Pnt& thePnt_f,
+Standard_Boolean IsDistanceIn3DTolerance (const gp_Pnt& thePnt_f,
const gp_Pnt& thePnt_l,
const Standard_Real aTol3d)
{
@@ -381,7 +380,7 @@ Standard_Boolean IsDistanceIn3DTolerance (const BRepAdaptor_Surface& /*aFaceSurf
if (Dist < aTol3d)
return Standard_True;
-#ifdef DEB
+#ifdef BREPCHECK_DEB
cout << endl;
cout << "--------Function IsDistanceIn3DTolerance(...)----------" << endl;
cout << "--- BRepCheck Wire: Closed3d -> Error" << endl;
@@ -422,7 +421,7 @@ Standard_Boolean IsDistanceIn2DTolerance (const BRepAdaptor_Surface& aFaceSurfac
{
cout << endl;
cout << "--------Function IsDistanceIn2DTolerance(...)----------" << endl;
- cout << "--- BRepCheck Wire: Not closed in 2d" << endl;
+ cout << "--- BRepCheck Wire: Not closed in 2D" << endl;
cout << "*****************************************************" << endl;
cout << "*dumin = " << dumin << "; dumax = " << dumax << endl;
cout << "* dvmin = " << dvmin << "; dvmax = " << dvmax << endl;
@@ -639,7 +638,7 @@ BRepCheck_Status BRepCheck_Wire::Closed2d(const TopoDS_Face& theFace,
if (!(IsDistanceIn2DTolerance(aFaceSurface, aP_first, aP_last, aTol3d)))
aClosedStat = BRepCheck_NotClosed;
- if(!IsDistanceIn3DTolerance(aFaceSurface, aPntRef, aPnt, aTol3d))
+ if(!IsDistanceIn3DTolerance(aPntRef, aPnt, aTol3d))
aClosedStat = BRepCheck_NotClosed;
if (Update)
@@ -1060,7 +1059,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
BRepCheck::Add(myMap(myShape),BRepCheck_SelfIntersectingWire);
}
delete [] tabDom;
-#ifdef DEB
+#ifdef BREPCHECK_DEB
static Standard_Integer numpoint=0;
cout<<"point p"<<++numpoint<<" "<<P3d.X()<<" "<<P3d.Y()<<" "<<P3d.Z()<<endl;cout.flush();
#endif
@@ -1093,7 +1092,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
}
else {
delete [] tabDom;
-#ifdef DEB
+#ifdef BREPCHECK_DEB
cout<<"BRepCheck_NoCurveOnSurface or BRepCheck_InvalidRange"<<endl;cout.flush();
#endif
if(tabCur(j).IsNull()) {
@@ -1215,7 +1214,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
//-- Check distance from edges to the curve joining
//-- the point of intersection with vertex (if exists)
if (localok == Standard_False && !CommonVertices.IsEmpty()) {
-#ifdef DEB
+#ifdef BREPCHECK_DEB
cout << "\n------------------------------------------------------\n" <<endl;
cout << "\n--- BRepCheck Wire: AutoIntersection Phase1 -> Erreur \n" <<endl;
@@ -1345,7 +1344,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
if (Update) {
BRepCheck::Add(myMap(myShape),BRepCheck_SelfIntersectingWire);
}
-#ifdef DEB
+#ifdef BREPCHECK_DEB
static Standard_Integer numpoint1=0;
cout<<"point p"<<++numpoint1<<" "<<P3d.X()<<" "<<P3d.Y()<<" "<<P3d.Z()<<endl;
cout.flush();
@@ -1479,7 +1478,7 @@ BRepCheck_Status BRepCheck_Wire::SelfIntersect(const TopoDS_Face& F,
if (Update) {
BRepCheck::Add(myMap(myShape),BRepCheck_SelfIntersectingWire);
}
-#ifdef DEB
+#ifdef BREPCHECK_DEB
static Standard_Integer numpoint1=0;
cout<<"point p"<<++numpoint1<<" "<<P3d.X()<<" "<<P3d.Y()<<" "<<P3d.Z()<<endl;
cout.flush();
@@ -1711,7 +1710,7 @@ void ChoixUV(const TopoDS_Vertex& theVertex,
gp_Pnt pEdg = bcEdg.Value(aParPiv);
gp_Pnt pEFound = bcEvois.Value(aParam);
- if(!IsDistanceIn3DTolerance(theFace, pEdg, pEFound, aTol3d))
+ if(!IsDistanceIn3DTolerance(pEdg, pEFound, aTol3d))
IsFound = Standard_False;
else
//angle was not defined but points are close
diff --git a/src/BRepFill/BRepFill_Sweep.cxx b/src/BRepFill/BRepFill_Sweep.cxx
index 8ecc52a2f5..8cf6650db8 100644
--- a/src/BRepFill/BRepFill_Sweep.cxx
+++ b/src/BRepFill/BRepFill_Sweep.cxx
@@ -601,7 +601,7 @@ static void BuildFace(const Handle(Geom_Surface)& S,
thePlane->UReverse();
BRepLib_MakeFace MkF( thePlane, WW );
if (MkF.Error() != BRepLib_FaceDone) {
-#if DEB
+#if BREPFILL_DEB
BRepLib_FaceError Err = MkF.Error();
cout << "Planar Face Error :" << Err << endl;
#endif
@@ -1734,7 +1734,7 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section,
}
}
-#if DEB
+#if BREPFILL_DEB
if (!issame)
cout<<"Sweep Warning : Edge not SameRange in the limits"<<endl;
#endif
diff --git a/src/BRepTest/BRepTest_ExtremaCommands.cxx b/src/BRepTest/BRepTest_ExtremaCommands.cxx
index 42a531ada0..61036860fe 100644
--- a/src/BRepTest/BRepTest_ExtremaCommands.cxx
+++ b/src/BRepTest/BRepTest_ExtremaCommands.cxx
@@ -58,7 +58,7 @@ static Standard_Integer distance (Draw_Interpretor& di,
static Standard_Integer distmini(Draw_Interpretor& di, Standard_Integer n, const char** a)
{
Standard_Integer i1;
-// gp_Pnt P;
+ // gp_Pnt P;
if (n != 4) return 1;
@@ -68,48 +68,63 @@ static Standard_Integer distmini(Draw_Interpretor& di, Standard_Integer n, const
if (dst.IsDone())
- {
+ {
#ifdef DEB
- //dst.Dump(cout);
- Standard_SStream aSStream;
- dst.Dump(aSStream);
- di << aSStream;
+ //dst.Dump(cout);
+ di << "*** Dump of \"BRepExtrema_DistShapeShape\" in DEBUG mode (begin) *****\n";
+ Standard_SStream aSStream;
+ dst.Dump(aSStream);
+ di << aSStream;
+ di << "*** Dump of \"BRepExtrema_DistShapeShape\" in DEBUG mode (end) *****\n";
#endif
- char named[100];
- Sprintf(named, "%s%s" ,ns0,"_val");
- char* tempd = named;
- Draw::Set(tempd,dst.Value());
- di << named << " ";
+ di << "\"distmini\" command returns:\n";
- for (i1=1; i1<= dst.NbSolution(); i1++)
- {
- gp_Pnt P1,P2;
- P1 = (dst.PointOnShape1(i1));
- P2 = (dst.PointOnShape2(i1));
- if (dst.Value()<=1.e-9)
- {
- TopoDS_Vertex V =BRepLib_MakeVertex(P1);
- char namev[100];
- if (i1==1)
- Sprintf(namev, "%s" ,ns0);
- else Sprintf(namev, "%s%d" ,ns0,i1);
- char* tempv = namev;
- DBRep::Set(tempv,V);
- di << namev << " ";
- }
- else
- {char name[100];
- TopoDS_Edge E = BRepLib_MakeEdge (P1, P2);
- if (i1==1)
- {Sprintf(name,"%s",ns0);}
- else {Sprintf(name,"%s%d",ns0,i1);}
- char* temp = name;
- DBRep::Set(temp,E);
- di << name << " " ;
- }
- }
+ char named[100];
+ Sprintf(named, "%s%s" ,ns0,"_val");
+ char* tempd = named;
+ Draw::Set(tempd,dst.Value());
+ di << named << " ";
+
+ for (i1=1; i1<= dst.NbSolution(); i1++)
+ {
+ gp_Pnt P1,P2;
+ P1 = (dst.PointOnShape1(i1));
+ P2 = (dst.PointOnShape2(i1));
+ if (dst.Value()<=1.e-9)
+ {
+ TopoDS_Vertex V =BRepLib_MakeVertex(P1);
+ char namev[100];
+ if (i1==1)
+ Sprintf(namev, "%s" ,ns0);
+ else
+ Sprintf(namev, "%s%d" ,ns0,i1);
+ char* tempv = namev;
+ DBRep::Set(tempv,V);
+ di << namev << " ";
}
+ else
+ {
+ char name[100];
+ TopoDS_Edge E = BRepLib_MakeEdge (P1, P2);
+ if (i1==1)
+ {
+ Sprintf(name,"%s",ns0);
+ }
+ else
+ {
+ Sprintf(name,"%s%d",ns0,i1);
+ }
+
+ char* temp = name;
+ DBRep::Set(temp,E);
+ di << name << " " ;
+ }
+ }
+
+ di << "\nOutput is complete.\n";
+
+ }
else di << "probleme"<< "\n";
//else cout << "probleme"<< endl;
diff --git a/src/Geom2dConvert/Geom2dConvert.cxx b/src/Geom2dConvert/Geom2dConvert.cxx
index dcb271094b..911c171937 100644
--- a/src/Geom2dConvert/Geom2dConvert.cxx
+++ b/src/Geom2dConvert/Geom2dConvert.cxx
@@ -1454,7 +1454,7 @@ void Geom2dConvert::C0BSplineToC1BSplineCurve(Handle(Geom2d_BSplineCurve)& BS,
BS->Knots(BSKnots);
BS->Multiplicities(BSMults);
- for (i=BS->FirstUKnotIndex();i<=(BS->LastUKnotIndex()-1);i++){
+ for (i=BS->FirstUKnotIndex() + 1;i<=(BS->LastUKnotIndex()-1);i++){
if (BSMults(i)==BS->Degree())
nbcurveC1++;
}
@@ -1472,7 +1472,8 @@ void Geom2dConvert::C0BSplineToC1BSplineCurve(Handle(Geom2d_BSplineCurve)& BS,
for (i=0;i<nbcurveC1;i++){
U1=U2;
- while (j < BS->LastUKnotIndex() && BSMults(j) < BS->Degree()) j++;
+ while (j < BS->LastUKnotIndex() && BSMults(j) < BS->Degree())
+ j++;
U2=BSKnots(j);
j++;
diff --git a/src/GeometryTest/GeometryTest_CurveCommands.cxx b/src/GeometryTest/GeometryTest_CurveCommands.cxx
index 776e06e97f..44e850fe2c 100644
--- a/src/GeometryTest/GeometryTest_CurveCommands.cxx
+++ b/src/GeometryTest/GeometryTest_CurveCommands.cxx
@@ -1638,6 +1638,51 @@ static Standard_Integer intersection (Draw_Interpretor& di,
return 0;
}
+//=======================================================================
+//function : GetCurveContinuity
+//purpose : Returns the continuity of the given curve
+//=======================================================================
+static Standard_Integer GetCurveContinuity( Draw_Interpretor& theDI,
+ Standard_Integer theNArg,
+ const char** theArgv)
+{
+ if(theNArg != 2)
+ {
+ theDI << "Use: getcurvcontinuity {curve or 2dcurve} \n";
+ return 1;
+ }
+
+ char aContName[7][3] = {"C0", //0
+ "G1", //1
+ "C1", //2
+ "G2", //3
+ "C2", //4
+ "C3", //5
+ "CN"}; //6
+
+ Handle(Geom2d_Curve) GC2d;
+ Handle(Geom_Curve) GC3d = DrawTrSurf::GetCurve(theArgv[1]);
+ if(GC3d.IsNull())
+ {
+ GC2d = DrawTrSurf::GetCurve2d(theArgv[1]);
+ if(GC2d.IsNull())
+ {
+ theDI << "Argument is not a 2D or 3D curve!\n";
+ return 1;
+ }
+ else
+ {
+ theDI << theArgv[1] << " has " << aContName[GC2d->Continuity()] << " continuity.\n";
+ }
+ }
+ else
+ {
+ theDI << theArgv[1] << " has " << aContName[GC3d->Continuity()] << " continuity.\n";
+ }
+
+ return 0;
+}
+
//=======================================================================
//function : CurveCommands
//purpose :
@@ -1740,5 +1785,11 @@ void GeometryTest::CurveCommands(Draw_Interpretor& theCommands)
__FILE__,
surfpoints,g);
+ theCommands.Add("getcurvcontinuity",
+ "getcurvcontinuity {curve or 2dcurve}: \n\tReturns the continuity of the given curve",
+ __FILE__,
+ GetCurveContinuity,g);
+
+
}
diff --git a/src/GeometryTest/GeometryTest_SurfaceCommands.cxx b/src/GeometryTest/GeometryTest_SurfaceCommands.cxx
index dbfc4bdf78..2e6ea7d639 100644
--- a/src/GeometryTest/GeometryTest_SurfaceCommands.cxx
+++ b/src/GeometryTest/GeometryTest_SurfaceCommands.cxx
@@ -324,6 +324,42 @@ static Standard_Integer fillcurves(Draw_Interpretor& /*di*/,
return 0;
}
+
+//=======================================================================
+//function : GetSurfaceContinuity
+//purpose : Returns the continuity of the given surface
+//=======================================================================
+static Standard_Integer GetSurfaceContinuity( Draw_Interpretor& theDI,
+ Standard_Integer theNArg,
+ const char** theArgv)
+{
+ if(theNArg != 2)
+ {
+ theDI << "Use: getsurfcontinuity surface\n";
+ return 1;
+ }
+
+ Handle(Geom_Surface) GS1 = DrawTrSurf::GetSurface(theArgv[1]);
+ if(GS1.IsNull())
+ {
+ theDI << "Argument is not a surface!\n";
+ return 1;
+ }
+
+ char aContName[7][3] = {"C0", //0
+ "G1", //1
+ "C1", //2
+ "G2", //3
+ "C2", //4
+ "C3", //5
+ "CN"}; //6
+
+ theDI << theArgv[1] << " has " << aContName[GS1->Continuity()] << " continuity.\n";
+
+ return 0;
+}
+
+
//=======================================================================
//function : SurfaceCommands
//purpose :
@@ -372,6 +408,12 @@ void GeometryTest::SurfaceCommands(Draw_Interpretor& theCommands)
__FILE__,
fillcurves,g);
+ theCommands.Add("getsurfcontinuity",
+ "getsurfcontinuity surface: \n\tReturns the continuity of the given surface",
+ __FILE__,
+ GetSurfaceContinuity,g);
+
+
}
diff --git a/src/HLRBRep/HLRBRep_Hider.cxx b/src/HLRBRep/HLRBRep_Hider.cxx
index 0cb7fa4029..dc0362c441 100644
--- a/src/HLRBRep/HLRBRep_Hider.cxx
+++ b/src/HLRBRep/HLRBRep_Hider.cxx
@@ -594,7 +594,7 @@ void HLRBRep_Hider::Hide(const Standard_Integer FI,
}
catch(Standard_Failure) {
-#ifdef DEB
+#ifdef HLRBREP_DEB
cout << "An exception was catched when hiding edge " << E;
cout << " by the face " << FI << endl;
Handle(Standard_Failure) fail = Standard_Failure::Caught();
diff --git a/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx b/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
index 3556bcd4bb..606c1b6d40 100644
--- a/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
+++ b/src/IntPatch/IntPatch_ImpImpIntersection_4.gxx
@@ -30,6 +30,21 @@ static
const gp_Cylinder& Cy2,
const Standard_Real Tol);
+// ------------------------------------------------------------------
+// MinMax : Replaces theParMIN = MIN(theParMIN, theParMAX),
+// theParMAX = MAX(theParMIN, theParMAX).
+// ------------------------------------------------------------------
+static inline void MinMax(Standard_Real& theParMIN, Standard_Real& theParMAX)
+{
+ if(theParMIN > theParMAX)
+ {
+ const Standard_Real aux = theParMAX;
+ theParMAX = theParMIN;
+ theParMIN = aux;
+ }
+}
+
+
//=======================================================================
//function : ProcessBounds
//purpose :
diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
index 74820314ca..7a9db91b5e 100644
--- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
@@ -2006,7 +2006,12 @@ Standard_Boolean STEPCAFControl_Writer::WriteDGTs (const Handle(XSControl_WorkSe
Handle(Interface_InterfaceModel) Model = WS->Model();
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
- Interface_Graph aGraph = WS->HGraph()->Graph();
+
+ const Handle(Interface_HGraph) aHGraph = WS->HGraph();
+ if(aHGraph.IsNull())
+ return Standard_False;
+
+ Interface_Graph aGraph = aHGraph->Graph();
Handle(XCAFDoc_DimTolTool) DGTTool = XCAFDoc_DocumentTool::DimTolTool( labels(1) );
if(DGTTool.IsNull() ) return Standard_False;
@@ -2387,6 +2392,11 @@ Standard_Boolean STEPCAFControl_Writer::WriteMaterials (const Handle(XSControl_W
Handle(Interface_InterfaceModel) Model = WS->Model();
Handle(XSControl_TransferWriter) TW = WS->TransferWriter();
Handle(Transfer_FinderProcess) FP = TW->FinderProcess();
+
+ const Handle(Interface_HGraph) aHGraph = WS->HGraph();
+ if(aHGraph.IsNull())
+ return Standard_False;
+
Interface_Graph aGraph = WS->HGraph()->Graph();
Handle(XCAFDoc_ShapeTool) ShTool = XCAFDoc_DocumentTool::ShapeTool( labels(1) );
if(ShTool.IsNull() ) return Standard_False;
diff --git a/src/Standard/Standard_Real.hxx b/src/Standard/Standard_Real.hxx
index f00695d91b..b70687c561 100644
--- a/src/Standard/Standard_Real.hxx
+++ b/src/Standard/Standard_Real.hxx
@@ -243,21 +243,6 @@ inline Standard_Real Min (const Standard_Real Val1,
return Val1 <= Val2 ? Val1 : Val2;
}
-// ------------------------------------------------------------------
-// MinMax : Replaces theParMIN = MIN(theParMIN, theParMAX),
-// theParMAX = MAX(theParMIN, theParMAX).
-// ------------------------------------------------------------------
-inline void MinMax(Standard_Real& theParMIN, Standard_Real& theParMAX)
-{
- if(theParMIN > theParMAX)
- {
- const Standard_Real aux = theParMAX;
- theParMAX = theParMIN;
- theParMIN = aux;
- }
-}
-
-
//-------------------------------------------------------------------
// Pow : Returns a real to a given power
//-------------------------------------------------------------------
diff --git a/src/StepToGeom/StepToGeom_MakeSurface.cxx b/src/StepToGeom/StepToGeom_MakeSurface.cxx
index 3416f3b7d0..9ecca66b62 100644
--- a/src/StepToGeom/StepToGeom_MakeSurface.cxx
+++ b/src/StepToGeom/StepToGeom_MakeSurface.cxx
@@ -67,6 +67,9 @@ Standard_Boolean StepToGeom_MakeSurface::Convert (const Handle(StepGeom_Surface)
}
if (SS->IsKind(STANDARD_TYPE(StepGeom_ElementarySurface))) {
const Handle(StepGeom_ElementarySurface) S1 = Handle(StepGeom_ElementarySurface)::DownCast(SS);
+ if(S1->Position().IsNull())
+ return Standard_False;
+
return StepToGeom_MakeElementarySurface::Convert(S1,*((Handle(Geom_ElementarySurface)*)&CS));
}
if (SS->IsKind(STANDARD_TYPE(StepGeom_SweptSurface))) {
diff --git a/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx b/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx
index 74546ec1dd..48af163c89 100644
--- a/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_WireframeBuilder.cxx
@@ -219,6 +219,10 @@ Standard_Boolean TopoDSToStep_WireframeBuilder::
if (C->IsKind(STANDARD_TYPE(Geom_TrimmedCurve)))
C = Handle(Geom_TrimmedCurve)::DownCast(C)->BasisCurve();
GeomToStep_MakeCurve gtpC(C);
+
+ if(!gtpC.IsDone())
+ return Standard_False;
+
Handle(StepGeom_Curve) pmsC = gtpC.Value();
// trim the curve
diff --git a/tests/blend/parse.rules b/tests/blend/parse.rules
index d85a1774c3..615476acd5 100644
--- a/tests/blend/parse.rules
+++ b/tests/blend/parse.rules
@@ -1,3 +1,2 @@
FAILED /\bFaulty\b/ bad shape
-IGNORE /^Error [23]d = [\d.-]+/ debug output of blend command
IGNORE /^Tcl Exception: tolerance ang : [\d.-]+/ blend failure - test will be failed as incomplete
diff --git a/tests/boolean/bopcommon_complex/D8 b/tests/boolean/bopcommon_complex/D8
index 22e0137a5a..7125c6cf54 100644
--- a/tests/boolean/bopcommon_complex/D8
+++ b/tests/boolean/bopcommon_complex/D8
@@ -1,7 +1,3 @@
-puts "TODO ?#22911 ALL: Error : The area of the resulting shape is"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
cpulimit 1500
restore [locate_data_file OCC228.brep] sh
@@ -10,4 +6,4 @@ explode sh
bop sh_1 sh_2
bopcommon result
-set square 0
+set square 66231.3
diff --git a/tests/boolean/bopcommon_complex/D9 b/tests/boolean/bopcommon_complex/D9
index adde1b2ce4..871970c964 100644
--- a/tests/boolean/bopcommon_complex/D9
+++ b/tests/boolean/bopcommon_complex/D9
@@ -1,7 +1,3 @@
-puts "TODO ?#22911 ALL: Error : The area of the resulting shape is"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
cpulimit 1500
restore [locate_data_file OCC228.brep] sh
@@ -10,4 +6,4 @@ explode sh
bop sh_2 sh_1
bopcommon result
-set square 0
+set square 66231.3
diff --git a/tests/boolean/bopcut_complex/E1 b/tests/boolean/bopcut_complex/E1
index 8a19f7159f..ed9f44ad10 100644
--- a/tests/boolean/bopcut_complex/E1
+++ b/tests/boolean/bopcut_complex/E1
@@ -1,7 +1,4 @@
-puts "TODO ?#22911 ALL: Error : The bopcut cannot be built."
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
+puts "TODO #22911 ALL: Error : The bopcut cannot be built."
cpulimit 1500
restore [locate_data_file OCC228.brep] sh
diff --git a/tests/boolean/bopcut_complex/E2 b/tests/boolean/bopcut_complex/E2
index 39e428d51f..36458f6fc2 100644
--- a/tests/boolean/bopcut_complex/E2
+++ b/tests/boolean/bopcut_complex/E2
@@ -1,7 +1,4 @@
-puts "TODO ?#22911 ALL: Error : The bopcut is not valid"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
+puts "TODO #22911 ALL: Error : The bopcut is not valid"
cpulimit 1500
restore [locate_data_file OCC228.brep] sh
diff --git a/tests/boolean/bopfuse_complex/C9 b/tests/boolean/bopfuse_complex/C9
index f16cb74423..188380e7e7 100644
--- a/tests/boolean/bopfuse_complex/C9
+++ b/tests/boolean/bopfuse_complex/C9
@@ -1,7 +1,4 @@
-puts "TODO ?#22911 ALL: Error : The bopfuse cannot be built."
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
+puts "TODO #22911 ALL: Error : The bopfuse cannot be built."
cpulimit 1500
restore [locate_data_file OCC228.brep] sh
diff --git a/tests/boolean/bopfuse_complex/D1 b/tests/boolean/bopfuse_complex/D1
index aeb4256f53..31b5d3d33b 100644
--- a/tests/boolean/bopfuse_complex/D1
+++ b/tests/boolean/bopfuse_complex/D1
@@ -1,7 +1,4 @@
-puts "TODO ?#22911 ALL: Error : The bopfuse cannot be built."
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
+puts "TODO #22911 ALL: Error : The bopfuse cannot be built."
cpulimit 1500
restore [locate_data_file OCC228.brep] sh
diff --git a/tests/boolean/bopfuse_complex/E5 b/tests/boolean/bopfuse_complex/E5
index 0dfbbc5474..88aadb055d 100644
--- a/tests/boolean/bopfuse_complex/E5
+++ b/tests/boolean/bopfuse_complex/E5
@@ -1,5 +1,4 @@
-puts "TODO DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
+cpulimit 1000
restore [locate_data_file OCC62.brep] sh
diff --git a/tests/boolean/bsection/N5 b/tests/boolean/bsection/N5
index e1dd7455d5..9f605dbb8e 100644
--- a/tests/boolean/bsection/N5
+++ b/tests/boolean/bsection/N5
@@ -1,9 +1,4 @@
-puts "TODO DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-puts "TODO ?DEBUG_OCC24121 Windows: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Windows: TEST INCOMPLETE"
-
-cpulimit 900
+cpulimit 1000
restore [locate_data_file lh3d_px2.brep] a
set i 1
diff --git a/tests/boolean/bsection/N6 b/tests/boolean/bsection/N6
index cb54f33173..dede481fe7 100644
--- a/tests/boolean/bsection/N6
+++ b/tests/boolean/bsection/N6
@@ -1,6 +1,3 @@
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
restore [locate_data_file lh3d_ro1.brep] a
compound result
isos a 0
diff --git a/tests/bugs/heal/bug23944 b/tests/bugs/heal/bug23944
index de86298034..565bff257e 100755
--- a/tests/bugs/heal/bug23944
+++ b/tests/bugs/heal/bug23944
@@ -1,6 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: iteration"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Faulty OCC23944"
-
puts "============"
puts "OCC23944"
puts "============"
@@ -15,20 +12,15 @@ restore [locate_data_file bug23944_s.draw] s
decho off
mkface f s
-decho on
-
-decho off
-set info [bsplres result f 1e-4 1e-9 15 100 C1 C2 0 1]
+bsplres result f 1e-4 1e-9 15 100 C1 C2 0 1
+mksurface rsurf result
+set info [getsurfcontinuity rsurf]
decho on
# Resume
puts ""
-if { [regexp {Debug mode} [dversion]] } {
- if { [regexp {Surface is aproximated with continuity 0} $info] } {
- puts "OK ${BugNumber}"
- } else {
- puts "Faulty ${BugNumber}"
- }
+if { [regexp {rsurf has C0 continuity.} $info] } {
+ puts "OK ${BugNumber}"
} else {
- puts "Test for debug mode only"
+ puts "Faulty ${BugNumber}"
}
diff --git a/tests/bugs/heal/bug24 b/tests/bugs/heal/bug24
index 3bffcc2209..90b4f7206e 100644
--- a/tests/bugs/heal/bug24
+++ b/tests/bugs/heal/bug24
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: ShapeProcess_Performer"
-
pload QAcommands
puts "======="
diff --git a/tests/bugs/iges/bug131_8 b/tests/bugs/iges/bug131_8
index 66a5d31e7b..a185355c1d 100755
--- a/tests/bugs/iges/bug131_8
+++ b/tests/bugs/iges/bug131_8
@@ -1,5 +1,4 @@
puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: --- BRepCheck Wire:"
puts "========"
puts "OCC131"
diff --git a/tests/bugs/iges/bug133_6 b/tests/bugs/iges/bug133_6
index ea0e668031..86bfd36f4c 100755
--- a/tests/bugs/iges/bug133_6
+++ b/tests/bugs/iges/bug133_6
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: \\*\\* Exception in IGESToBRep_BasicCurve"
-
puts "========================"
puts "BUC60984"
puts "OCC91"
diff --git a/tests/bugs/modalg_4/bug827_1 b/tests/bugs/modalg_4/bug827_1
index 723752701a..143380ad42 100755
--- a/tests/bugs/modalg_4/bug827_1
+++ b/tests/bugs/modalg_4/bug827_1
@@ -1,13 +1,5 @@
-# Errors are different in Debug and Release mode
-puts "TODO ?#23910 ALL: Error : The square of result shape is"
-puts "TODO ?#23910 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?#23910 ALL: Faulty OCC827"
-
-# Debug on Windows
-puts "TODO ?#23910 ALL: Standard_Failure : Exception in REV Function"
-puts "TODO ?#23910 ALL: result is not a topological shape!!!"
-puts "TODO ?#23910 ALL: TEST INCOMPLETE"
-
+puts "TODO #23910 ALL: Faulty OCC827"
+puts "TODO #23910 ALL: Faulty shapes in variables faulty_1 to faulty_"
pload QAcommands
puts "========"
@@ -50,5 +42,5 @@ if { [ catch { set info_result [OCC827 a1 a2 a3 res1 res2 0] } ] } {
}
renamevar res2 result
}
-set square 0
+set square 7046.01
set 2dviewer 1
diff --git a/tests/bugs/modalg_4/bug8842_16 b/tests/bugs/modalg_4/bug8842_16
index 456d2a371e..ab6e8106c0 100755
--- a/tests/bugs/modalg_4/bug8842_16
+++ b/tests/bugs/modalg_4/bug8842_16
@@ -1,11 +1,3 @@
-puts "TODO ?OCC11111 ALL: OCC8842: Faulty"
-puts "TODO ?OCC11111 ALL: \\*\\* Exception"
-puts "TODO ?OCC11111 ALL: An exception was caught"
-puts "TODO ?OCC11111 ALL: Error : Result shape is WRONG"
-puts "TODO ?OCC11111 ALL: Error : The square of result shape is"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
puts "============"
puts "OCC8842"
puts "============"
@@ -40,16 +32,16 @@ if [catch { myoffset result cyl2 -5 1 } catch_result] {
puts "${BugNumber}: Faulty (1)"
} else {
-set square 3542.24
-set nb_v_good 60
-set nb_e_good 90
-set nb_w_good 42
-set nb_f_good 40
-set nb_sh_good 5
-set nb_sol_good 5
+set square 20106.2
+set nb_v_good 6
+set nb_e_good 9
+set nb_w_good 5
+set nb_f_good 5
+set nb_sh_good 1
+set nb_sol_good 1
set nb_compsol_good 0
-set nb_compound_good 1
-set nb_shape_good 243
+set nb_compound_good 0
+set nb_shape_good 27
}
diff --git a/tests/bugs/modalg_4/bug8842_8 b/tests/bugs/modalg_4/bug8842_8
index 11f1ca35c6..10a97698b6 100755
--- a/tests/bugs/modalg_4/bug8842_8
+++ b/tests/bugs/modalg_4/bug8842_8
@@ -1,10 +1,3 @@
-puts "TODO ?OCC11111 ALL: OCC8842: Faulty"
-puts "TODO ?OCC11111 ALL: \\*\\* Exception"
-puts "TODO ?OCC11111 ALL: An exception was caught"
-puts "TODO ?OCC11111 ALL: Error : The square of result shape is"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
puts "============"
puts "OCC8842"
puts "============"
@@ -41,7 +34,7 @@ if [catch { myoffset result con2 -5 1 } catch_result] {
puts "${BugNumber}: Faulty (1)"
} else {
-set square 22391
+set square 9885.2
set nb_v_good 4
set nb_e_good 9
set nb_w_good 4
diff --git a/tests/bugs/modalg_5/bug23906 b/tests/bugs/modalg_5/bug23906
index c13ef95395..f1e2dd7d97 100755
--- a/tests/bugs/modalg_5/bug23906
+++ b/tests/bugs/modalg_5/bug23906
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64: Elapsed time is more than 0.1 seconds"
-
puts "============"
puts "OCC23906"
puts "============"
diff --git a/tests/bugs/moddata_1/bug11081_1 b/tests/bugs/moddata_1/bug11081_1
index a1df5cc984..cab54cbcbf 100755
--- a/tests/bugs/moddata_1/bug11081_1
+++ b/tests/bugs/moddata_1/bug11081_1
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Faulty OCC11081"
-
puts "========================"
puts "OCC11081"
puts "========================"
@@ -10,19 +8,18 @@ puts ""
set BugNumber OCC11081
+set RefResult "\"distmini\" command returns:\ndd_val dd dd2 \nOutput is complete."
+
# infinite line is used
line ll 6834.93 -4100 500 0 0 1
mkedge ee ll
restore [locate_data_file OCC11081.brep] section4100
-distmini dd ee section4100
set res_list [distmini dd ee section4100]
-set res_length [llength ${res_list}]
-puts "res_length = ${res_length}"
# Resume
puts ""
-if { ${res_length} != 3 } {
+if { [regexp $RefResult $res_list] != 1 } {
puts "Faulty ${BugNumber}"
} else {
puts "OK ${BugNumber}"
diff --git a/tests/bugs/moddata_1/bug11081_2 b/tests/bugs/moddata_1/bug11081_2
index 8cce624839..35cfb0e5d8 100755
--- a/tests/bugs/moddata_1/bug11081_2
+++ b/tests/bugs/moddata_1/bug11081_2
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Faulty OCC11081"
-
puts "========================"
puts "OCC11081"
puts "========================"
@@ -9,6 +7,7 @@ puts ""
#######################################################################
set BugNumber OCC11081
+set RefResult "\"distmini\" command returns:\ndd_val dd dd2 \nOutput is complete."
# finite line is used
@@ -17,13 +16,11 @@ trim trll ll -1000 -500
mkedge tree trll
restore [locate_data_file OCC11081.brep] section4100
set res_list [distmini dd tree section4100]
-set res_length [llength ${res_list}]
-puts "res_length = ${res_length}"
# Resume
puts ""
-if { ${res_length} != 3 } {
+if { [regexp $RefResult $res_list] != 1 } {
puts "Faulty ${BugNumber}"
} else {
puts "OK ${BugNumber}"
-}
+}
\ No newline at end of file
diff --git a/tests/bugs/moddata_1/bug20683 b/tests/bugs/moddata_1/bug20683
index f636bbb2c9..3c427ee747 100755
--- a/tests/bugs/moddata_1/bug20683
+++ b/tests/bugs/moddata_1/bug20683
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Faulty OCC20683"
-
puts "========================"
puts "OCC20683"
puts "========================"
@@ -9,6 +7,7 @@ puts ""
#######################################################################
set BugNumber OCC20683
+set RefResult "\"distmini\" command returns:\nd_val d d2 \nOutput is complete."
# finite line is used
line ll 6834.93 -4100 500 0 0 1
@@ -19,14 +18,11 @@ restore [locate_data_file OCC20683_circ1.brep] e1
restore [locate_data_file OCC20683_circ2.brep] e2
set res_list [distmini d e1 e2]
-set res_length [llength ${res_list}]
-puts "res_length = ${res_length}"
# Resume
puts ""
-if { ${res_length} != 3 } {
+if { [regexp $RefResult $res_list] != 1 } {
puts "Faulty ${BugNumber}"
} else {
puts "OK ${BugNumber}"
}
-
diff --git a/tests/bugs/moddata_3/bug599 b/tests/bugs/moddata_3/bug599
index 9dea4ad9da..6c872d7ec2 100644
--- a/tests/bugs/moddata_3/bug599
+++ b/tests/bugs/moddata_3/bug599
@@ -1,6 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
puts "========================"
puts " OCC599"
puts "========================"
@@ -9,6 +6,8 @@ puts ""
## Result of BOPFUSE operation is unclosed shape inspite of source solids are valid
#########################################################
+cpulimit 1000
+
restore [locate_data_file OCC600_1.brep] a
checkshape a
restore [locate_data_file OCC600_2.brep] b
diff --git a/tests/bugs/parse.rules b/tests/bugs/parse.rules
index eab3eb5026..b939c8cd4e 100755
--- a/tests/bugs/parse.rules
+++ b/tests/bugs/parse.rules
@@ -1,4 +1,3 @@
FAILED /\bFaulty\b/ bad shape
-IGNORE /^Error [23]d = [\d.-]+/ debug output of blend command
SKIPPED /Error: unsupported locale specification/ locale is unavailable on tested system
OK /Relative error of mass computation/ message from vprops
diff --git a/tests/bugs/vis/bug23813 b/tests/bugs/vis/bug23813
index c8c1fe2010..85e0b56af3 100644
--- a/tests/bugs/vis/bug23813
+++ b/tests/bugs/vis/bug23813
@@ -1,6 +1,4 @@
## It's impossible to make vdump with non-default parameters (width and height) on remote PC
-puts "TODO ?OCC23813 Windows: Tcl Exception: Dumping failed!"
-puts "TODO ?OCC23813 Windows: TEST INCOMPLETE"
puts "============"
puts "OCC23813"
diff --git a/tests/bugs/xde/bug24759 b/tests/bugs/xde/bug24759
index f9edb71b7f..b8be26c162 100644
--- a/tests/bugs/xde/bug24759
+++ b/tests/bugs/xde/bug24759
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24759 ALL: Warning: StepToGeom_MakeSurface"
-
puts "================"
puts "OCC24759"
puts "================"
diff --git a/tests/bugs/xde/bug394 b/tests/bugs/xde/bug394
index 7278fdb50b..e0f088bc06 100644
--- a/tests/bugs/xde/bug394
+++ b/tests/bugs/xde/bug394
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: ShapeFix_Wireframe"
-
puts "================"
puts "OCC394"
puts "SAM1296"
diff --git a/tests/bugs/xde/bug810 b/tests/bugs/xde/bug810
index 2fba66df0d..66a68ffbac 100755
--- a/tests/bugs/xde/bug810
+++ b/tests/bugs/xde/bug810
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: ShapeFix_Edge"
-
puts "========================"
puts " OCC810 "
puts "========================"
diff --git a/tests/bugs/xde/bug810_1 b/tests/bugs/xde/bug810_1
index f0b2a569d2..0ba194ffd7 100755
--- a/tests/bugs/xde/bug810_1
+++ b/tests/bugs/xde/bug810_1
@@ -1,5 +1,3 @@
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: ShapeFix_Edge"
-
puts "========================"
puts "OCC810"
puts "========================"
diff --git a/tests/chamfer/parse.rules b/tests/chamfer/parse.rules
index 97c152f203..610d206403 100644
--- a/tests/chamfer/parse.rules
+++ b/tests/chamfer/parse.rules
@@ -1,2 +1 @@
FAILED /\bFaulty\b/ bad shape
-IGNORE /^Error [23]d = [\d.-]+/ debug output of blend command
diff --git a/tests/de/iges_3/A3 b/tests/de/iges_3/A3
index 02456db5ba..2fcb9f2bad 100755
--- a/tests/de/iges_3/A3
+++ b/tests/de/iges_3/A3
@@ -6,7 +6,7 @@ puts "TODO CR23096 ALL: COLORS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO CR23096 DEBUG_OCC24121 Debian60-64: Error : 1 differences with reference data found :"
+puts "TODO CR25275 DEBUG_OCC24121 Debian60-64: Error : 1 differences with reference data found :"
set LinuxDiff 1
set filename UKI60107-6.igs
diff --git a/tests/de/iges_3/A7 b/tests/de/iges_3/A7
index 89401a38a9..98f9b2f8ac 100644
--- a/tests/de/iges_3/A7
+++ b/tests/de/iges_3/A7
@@ -1,8 +1,5 @@
# !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO ?CR23096 ALL: LABELS : Faulty"
-puts "TODO ?DEBUG_OCC24121 Debian60-64 Windows: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64 Windows: TEST INCOMPLETE"
-
+puts "TODO CR23096 ALL: LABELS : Faulty"
set filename t_cat_424_002_sgi_hybdrw_vw_dosenhalter_standard.igs
diff --git a/tests/de/step_1/D1 b/tests/de/step_1/D1
index 9bcbab603c..4aca45d8b4 100644
--- a/tests/de/step_1/D1
+++ b/tests/de/step_1/D1
@@ -1,9 +1,5 @@
# !!!! This file is generated automatically, do not edit manually! See end script
puts "TODO CR23096 ALL: LABELS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: ShapeFix_ComposeShell"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: color name"
-
-
set filename trj9_b2-ai-214.stp
diff --git a/tests/de/step_1/E6 b/tests/de/step_1/E6
index ca180f91b1..5c819e7004 100755
--- a/tests/de/step_1/E6
+++ b/tests/de/step_1/E6
@@ -1,5 +1,4 @@
# !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename trj4_s1-ai-214.stp
diff --git a/tests/de/step_1/F9 b/tests/de/step_1/F9
index 6778ec8b48..e67b6d0659 100644
--- a/tests/de/step_1/F9
+++ b/tests/de/step_1/F9
@@ -1,6 +1,5 @@
# !!!! This file is generated automatically, do not edit manually! See end script
puts "TODO CR23096 ALL: STATSHAPE : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error : 1 differences with reference data found"
set filename trj6_pm4-al-214.stp
diff --git a/tests/de/step_1/G2 b/tests/de/step_1/G2
index 0302b13819..78df615ead 100644
--- a/tests/de/step_1/G2
+++ b/tests/de/step_1/G2
@@ -1,7 +1,6 @@
# !!!! This file is generated automatically, do not edit manually! See end script
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename db_as1-A.stp
diff --git a/tests/de/step_1/G3 b/tests/de/step_1/G3
index 53e49136a5..da8cb28784 100644
--- a/tests/de/step_1/G3
+++ b/tests/de/step_1/G3
@@ -1,7 +1,6 @@
# !!!! This file is generated automatically, do not edit manually! See end script
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename db_as1-B.stp
diff --git a/tests/de/step_1/G5 b/tests/de/step_1/G5
index 8d7d3cde59..f2e58cc993 100644
--- a/tests/de/step_1/G5
+++ b/tests/de/step_1/G5
@@ -2,7 +2,6 @@
puts "TODO CR23096 ALL: TPSTAT : Faulty"
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename trj3_s1-db-214.stp
diff --git a/tests/de/step_1/G6 b/tests/de/step_1/G6
index 2c705b5a78..e434de36c5 100644
--- a/tests/de/step_1/G6
+++ b/tests/de/step_1/G6
@@ -1,7 +1,6 @@
# !!!! This file is generated automatically, do not edit manually! See end script
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename tr8_as2_db.stp
diff --git a/tests/de/step_1/G7 b/tests/de/step_1/G7
index ffbc018a3a..15cb11a417 100644
--- a/tests/de/step_1/G7
+++ b/tests/de/step_1/G7
@@ -1,7 +1,6 @@
# !!!! This file is generated automatically, do not edit manually! See end script
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename tr8_as2a_db.stp
diff --git a/tests/de/step_1/ZF7 b/tests/de/step_1/ZF7
index 893230cdd8..b006c0c820 100644
--- a/tests/de/step_1/ZF7
+++ b/tests/de/step_1/ZF7
@@ -1,11 +1,6 @@
# !!!! This file is generated automatically, do not edit manually! See end script
puts "TODO ?CR23096 ALL: TPSTAT : Faulty"
-puts "TODO ?CR23096 ALL: STATSHAPE : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64: \\*\\* Exception \\*\\*.*"
-puts "TODO DEBUG_OCC24121 Debian60-64: An exception was caught"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: First - file was not written - exception"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error : Here is writing problem"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error : 3 differences with reference data found"
+puts "TODO ?CR23096 ALL: STATSHAPE : Faulty"
set filename S4132-test.stp
@@ -13,7 +8,7 @@ set ref_data {
DATA : Faulties = 0 ( 0 ) Warnings = 0 ( 0 ) Summary = 0 ( 0 )
TPSTAT : Faulties = 0 ( 0 ) Warnings = 1 ( 0 ) Summary = 1 ( 0 )
CHECKSHAPE : Wires = 0 ( 0 ) Faces = 0 ( 0 ) Shells = 0 ( 0 ) Solids = 0 ( 0 )
-NBSHAPES : Solid = 0 ( 0 ) Shell = 6 ( 0 ) Face = 6 ( 6 ) Summary = 79 ( 73 )
+NBSHAPES : Solid = 0 ( 0 ) Shell = 6 ( 0 ) Face = 6 ( 6 ) Summary = 78 ( 73 )
STATSHAPE : Solid = 0 ( 0 ) Shell = 6 ( 0 ) Face = 6 ( 6 ) FreeWire = 0 ( 0 ) FreeEdge = 3 ( 4 ) SharedEdge = 27 ( 28 )
TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = 1e-007 ( 1e-007 )
LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 0 ( 0 ) LayerLabels = 0 ( 0 )
diff --git a/tests/de/step_1/ZG2 b/tests/de/step_1/ZG2
index ed737b7f91..d489bc3809 100644
--- a/tests/de/step_1/ZG2
+++ b/tests/de/step_1/ZG2
@@ -1,6 +1,5 @@
# !!!! This file is generated automatically, do not edit manually! See end script
puts "TODO CR23096 ALL: LABELS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename as1ug.stp
diff --git a/tests/de/step_1/ZH7 b/tests/de/step_1/ZH7
index d733ee7382..e935dcf799 100644
--- a/tests/de/step_1/ZH7
+++ b/tests/de/step_1/ZH7
@@ -2,7 +2,6 @@
puts "TODO CR23096 ALL: NBSHAPES : Faulty"
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename tr8_ha1_db.stp
diff --git a/tests/de/step_2/A5 b/tests/de/step_2/A5
index 4e2051e8dc..b1a3d84370 100755
--- a/tests/de/step_2/A5
+++ b/tests/de/step_2/A5
@@ -1,5 +1,4 @@
# !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename r86ug.stp
diff --git a/tests/de/step_2/D9 b/tests/de/step_2/D9
index 08947874ee..9c6e40f974 100644
--- a/tests/de/step_2/D9
+++ b/tests/de/step_2/D9
@@ -2,7 +2,6 @@
puts "TODO CR23096 ALL: TPSTAT : Faulty"
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename bm4_db_punch_a.stp
diff --git a/tests/de/step_2/E1 b/tests/de/step_2/E1
index c073652f1b..c61a19e385 100644
--- a/tests/de/step_2/E1
+++ b/tests/de/step_2/E1
@@ -2,7 +2,6 @@
puts "TODO CR23096 ALL: TPSTAT : Faulty"
puts "TODO CR23096 ALL: STATSHAPE : Faulty"
puts "TODO CR23096 ALL: LABELS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: StepToTopoDS_TranslateCompositeCurve"
set filename tr9_r0901-al.stp
diff --git a/tests/de/step_2/E7 b/tests/de/step_2/E7
index f356c266c3..45d66e60fa 100644
--- a/tests/de/step_2/E7
+++ b/tests/de/step_2/E7
@@ -3,7 +3,6 @@ puts "TODO CR23096 ALL: CHECKSHAPE : Faulty"
puts "TODO CR23096 ALL: NBSHAPES : Faulty"
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: StepToGeom_MakeSurface"
set LinuxDiff 3
set filename r76sy.stp
diff --git a/tests/de/step_2/E9 b/tests/de/step_2/E9
index 3bfeefb0de..ae363724b3 100644
--- a/tests/de/step_2/E9
+++ b/tests/de/step_2/E9
@@ -2,7 +2,6 @@
puts "TODO CR23096 ALL: TPSTAT : Faulty"
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename bm4_db_punch_c.stp
diff --git a/tests/de/step_2/F2 b/tests/de/step_2/F2
index d30b077236..1060bf44d8 100644
--- a/tests/de/step_2/F2
+++ b/tests/de/step_2/F2
@@ -1,7 +1,6 @@
# !!!! This file is generated automatically, do not edit manually! See end script
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename bm4_db_conn_a.stp
diff --git a/tests/de/step_2/F3 b/tests/de/step_2/F3
index 80d26fe3c0..295ba7f092 100644
--- a/tests/de/step_2/F3
+++ b/tests/de/step_2/F3
@@ -2,7 +2,6 @@
puts "TODO CR23096 ALL: TPSTAT : Faulty"
puts "TODO CR23096 ALL: LABELS : Faulty"
puts "TODO CR23096 ALL: LAYERS : Faulty"
-puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Error: STEPCAFControl_Reader"
set filename bm4_db_conn_d.stp
diff --git a/tests/demo/parse.rules b/tests/demo/parse.rules
index 0cfa1d732e..0d2b3c3ef3 100644
--- a/tests/demo/parse.rules
+++ b/tests/demo/parse.rules
@@ -1,3 +1,2 @@
OK /Wanted exception/ intentionally generated exception
FAILED /Failure message/ artificial failure
-IGNORE /^Error [23]d = [\d.-]+/ debug output of blend command
diff --git a/tests/fillet2d/parse.rules b/tests/fillet2d/parse.rules
index eab3eb5026..b939c8cd4e 100644
--- a/tests/fillet2d/parse.rules
+++ b/tests/fillet2d/parse.rules
@@ -1,4 +1,3 @@
FAILED /\bFaulty\b/ bad shape
-IGNORE /^Error [23]d = [\d.-]+/ debug output of blend command
SKIPPED /Error: unsupported locale specification/ locale is unavailable on tested system
OK /Relative error of mass computation/ message from vprops
diff --git a/tests/heal/data/advanced/H5 b/tests/heal/data/advanced/H5
index ed63a3ac60..0ae5a6bb9a 100644
--- a/tests/heal/data/advanced/H5
+++ b/tests/heal/data/advanced/H5
@@ -3,7 +3,6 @@ if {[string compare $command "ShapeConvertRev"] == 0 } {
}
if {[string compare $command "SplitAngle"] == 0 } {
puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
- puts "TODO ?DEBUG_OCC24121 Debian60-64 Windows: Error: Exception in ShapeUpgrade_FaceDivide"
}
restore [locate_data_file CTO900_ger60598c.rle] a
diff --git a/tests/heal/data/advanced/W8 b/tests/heal/data/advanced/W8
index 8bd9eedd4e..55a5318763 100644
--- a/tests/heal/data/advanced/W8
+++ b/tests/heal/data/advanced/W8
@@ -1,7 +1,6 @@
if {[string compare $command "SplitAngle"] == 0 } {
- puts "TODO ?OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_56 "
- puts "TODO ?DEBUG_OCC24121 Windows: Faulty shapes in variables faulty_1 to faulty_"
-
+ puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
}
+
restore [locate_data_file FORM-11.brep] a
diff --git a/tests/heal/data/advanced/Y3 b/tests/heal/data/advanced/Y3
index 1ef7f3b667..bfb4398f7e 100644
--- a/tests/heal/data/advanced/Y3
+++ b/tests/heal/data/advanced/Y3
@@ -1,7 +1,5 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
- puts "TODO ?OCC23127 ALL: Error : The area of the resulting shape is"
- puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
- puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
+ puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
restore [locate_data_file METABO11.brep] a
diff --git a/tests/heal/data/advanced/Y4 b/tests/heal/data/advanced/Y4
index d20fcc4a6c..aedb0c2e10 100644
--- a/tests/heal/data/advanced/Y4
+++ b/tests/heal/data/advanced/Y4
@@ -1,7 +1,5 @@
if {[string compare $command "SplitAngle"] == 0 } {
- puts "TODO ?OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
- puts "TODO ?DEBUG_OCC24121 Windows: Faulty shapes in variables faulty_1 to faulty_"
-
+ puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
}
restore [locate_data_file METABO12.brep] a
diff --git a/tests/heal/data/advanced/Z4 b/tests/heal/data/advanced/Z4
index 6f5c246901..f829d22150 100644
--- a/tests/heal/data/advanced/Z4
+++ b/tests/heal/data/advanced/Z4
@@ -1,7 +1,5 @@
if {[string compare $command "SplitAngle"] == 0 } {
- puts "TODO ?OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
- puts "TODO ?DEBUG_OCC24121 Windows: Faulty shapes in variables faulty_1 to faulty_"
-
+ puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
}
restore [locate_data_file P-ROUES.brep] a
diff --git a/tests/heal/data/advanced/ZB5 b/tests/heal/data/advanced/ZB5
index 2814ddb653..aa8bb65c07 100644
--- a/tests/heal/data/advanced/ZB5
+++ b/tests/heal/data/advanced/ZB5
@@ -1,7 +1,5 @@
if { [string compare $command "ShapeConvertRev"] == 0 } {
- puts "TODO ?OCC23127 ALL: Error : The area of the resulting shape is"
- puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
- puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
+ puts "TODO OCC23127 ALL: Error : The area of the resulting shape is"
}
restore [locate_data_file TOP01245_2.brep] a
diff --git a/tests/heal/data/advanced/ZE8 b/tests/heal/data/advanced/ZE8
index 3649b1b780..4b10e868ca 100644
--- a/tests/heal/data/advanced/ZE8
+++ b/tests/heal/data/advanced/ZE8
@@ -1,24 +1,5 @@
if {[string compare $command "SplitAngle"] == 0 } {
- set os "ALL"
- if {[array get env os_type] != ""} {
- set os $env(os_type)
- }
- if {
- [string compare $os "Mandriva2008"] == 0
- } {
- puts "TODO ?OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
- } else {
- puts "TODO ?OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
- }
-}
-if {[string compare $command "ShapeDivide"] == 0 } {
- puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
- puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-}
-
-if {[string compare $command "ShapeConvertRev"] == 0 } {
- puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
- puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
+ puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_"
}
restore [locate_data_file BPLSEITLI.brep] a
diff --git a/tests/heal/data/advanced/ZE9 b/tests/heal/data/advanced/ZE9
index 95af3daa61..627c037280 100644
--- a/tests/heal/data/advanced/ZE9
+++ b/tests/heal/data/advanced/ZE9
@@ -1,15 +1,6 @@
if {[string compare $command "SplitAngle"] == 0 } {
puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_28 "
}
-if {[string compare $command "ShapeDivide"] == 0 } {
- puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
- puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-}
-
-if {[string compare $command "ShapeConvertRev"] == 0 } {
- puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
- puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-}
restore [locate_data_file BPLSEITRE.brep] a
diff --git a/tests/heal/parse.rules b/tests/heal/parse.rules
index ecb7c874b7..610d206403 100644
--- a/tests/heal/parse.rules
+++ b/tests/heal/parse.rules
@@ -1,6 +1 @@
FAILED /\bFaulty\b/ bad shape
-IGNORE /Error: Number of intervals are not equal for 2d 3d. Ignored./ Debug mode message from DT_ShapeDivide
-IGNORE /Warning: GeomConvert_ApproxSurface Exception: try to decrease continuity/ DEbug mode message from DT_ToBspl
-IGNORE /Error: ShapeFix_ComposeShell::MakeFacesOnPatch: can[']t dispatch wires/ Debug mode output
-IGNORE /Warning: ShapeFix_WireSegment::DefineI[UV]M[ia][nx]: indexation error/ debug mode output on bad geometries
-IGNORE /error = [0-9eE.+-]+\s+spans = [0-9]+/ debug output of surface approximator
\ No newline at end of file
diff --git a/tests/mesh/parse.rules b/tests/mesh/parse.rules
deleted file mode 100644
index 74f0e7cdc4..0000000000
--- a/tests/mesh/parse.rules
+++ /dev/null
@@ -1 +0,0 @@
-IGNORE /^Error [23]d = [\d.-]+/ debug output of blend command
diff --git a/tests/offset/faces_type_i/C9 b/tests/offset/faces_type_i/C9
index 5dfd985d36..8feeb94fd2 100644
--- a/tests/offset/faces_type_i/C9
+++ b/tests/offset/faces_type_i/C9
@@ -1,12 +1,6 @@
-puts "TODO ?OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC23748 ALL: Tcl Exception: ERROR. offsetperform operation not done."
-puts "TODO ?OCC23748 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC23748 ALL: Error : The volume of the resulting shape is"
-puts "TODO ?OCC23748 ALL: Error : The area of face result_. of the resulting shape is negative"
-puts "TODO ?OCC23748 ALL: TEST INCOMPLETE"
-puts "TODO ?DEBUG_OCC24121 : Error : The area of face"
-puts "TODO ?OCC24156 MacOS: Error : The area of face"
-
+puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
+puts "TODO OCC23748 ALL: Tcl Exception: ERROR. offsetperform operation not done."
+puts "TODO OCC23547 ALL: TEST INCOMPLETE"
psphere s 15 270
OFFSETSHAPE 1 {s_2} $calcul $type
diff --git a/tests/offset/parse.rules b/tests/offset/parse.rules
index 97c152f203..610d206403 100644
--- a/tests/offset/parse.rules
+++ b/tests/offset/parse.rules
@@ -1,2 +1 @@
FAILED /\bFaulty\b/ bad shape
-IGNORE /^Error [23]d = [\d.-]+/ debug output of blend command
diff --git a/tests/offset/wire_closed_inside_0_025/D1 b/tests/offset/wire_closed_inside_0_025/D1
index e17fa7b69a..ef319ac193 100644
--- a/tests/offset/wire_closed_inside_0_025/D1
+++ b/tests/offset/wire_closed_inside_0_025/D1
@@ -1,9 +1,6 @@
cpulimit 2400
-puts "TODO ?OCC23068 ALL: Error : result is not a topological shape"
-puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
-puts "TODO ?OCC23748 ALL: Error: Offset is not done."
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
+puts "TODO OCC23068 ALL: Error : The offset cannot be built."
+puts "TODO OCC23748 ALL: Error: Offset is not done."
restore [locate_data_file offset_wire_041.brep] s
diff --git a/tests/parse.rules b/tests/parse.rules
index 5c4a69dc8b..5211d04182 100644
--- a/tests/parse.rules
+++ b/tests/parse.rules
@@ -1,6 +1,5 @@
SKIPPED /Tcl Exception: .*[fF]ile .* could not be found/ data file is missing
IGNORE /Tcl Exception: [*][*] Exception [*][*]/ duplicate report on exception on Tcl level
-IGNORE /BRepCheck Wire: Closed2d/ Debug output of checkshape
FAILED /\b[Ee]xception\b/ exception
FAILED /\b[Ee][Rr][Rr][Oo][Rr]\b/ error
FAILED /Process killed by CPU limit/ Killed by CPU limit
diff --git a/tests/pipe/parse.rules b/tests/pipe/parse.rules
index 97c152f203..610d206403 100644
--- a/tests/pipe/parse.rules
+++ b/tests/pipe/parse.rules
@@ -1,2 +1 @@
FAILED /\bFaulty\b/ bad shape
-IGNORE /^Error [23]d = [\d.-]+/ debug output of blend command
diff --git a/tests/thrusection/parse.rules b/tests/thrusection/parse.rules
index 54f97c2a3c..610d206403 100644
--- a/tests/thrusection/parse.rules
+++ b/tests/thrusection/parse.rules
@@ -1,2 +1 @@
FAILED /\bFaulty\b/ bad shape
-IGNORE /Error 3d = [0-9.]+/ debug dump of approximator