git: 23b7d54e92c9 - main - cad/opencascade: upgrade to 7.7.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Sat, 12 Nov 2022 13:32:03 UTC
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=23b7d54e92c90054095d1aabb168fe29e9cab851

commit 23b7d54e92c90054095d1aabb168fe29e9cab851
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2022-11-12 10:44:01 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2022-11-12 13:32:00 +0000

    cad/opencascade: upgrade to 7.7.0
    
    Release notes at
    <https://www.opencascade.com/open-cascade-technology-7-7-0-released/>.
    
    Differential Revision:  https://reviews.freebsd.org/D36884
---
 cad/opencascade/Makefile                           |   13 +-
 cad/opencascade/distinfo                           |    6 +-
 cad/opencascade/files/patch-CMakeLists.txt         |   18 +-
 .../files/patch-adm_cmake_occt__macros.cmake       |   14 +-
 cad/opencascade/files/patch-inc_Standard__Time.hxx |   19 -
 ...c_STEPConstruct_STEPConstruct__AP203Context.cxx |    4 +-
 .../files/patch-src_Standard_Standard__CString.cxx |    4 +-
 .../files/patch-src_Standard_Standard__Time.hxx    |   19 -
 cad/opencascade/pkg-plist                          | 1561 +++++++++++++-------
 9 files changed, 1094 insertions(+), 564 deletions(-)

diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 16c5269f22fe..325e005c58d2 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	opencascade
-PORTVERSION=	7.6.0
-PORTREVISION=	10
+DISTVERSION=	7.7.0
 CATEGORIES=	cad science
 MASTER_SITES=	LOCAL/thierry
 
@@ -19,6 +18,7 @@ BUILD_DEPENDS=	rapidjson>0:devel/rapidjson			\
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 		libfreetype.so:print/freetype2		\
 		libexpat.so:textproc/expat2		\
+		libdraco.so:archivers/draco		\
 		libpng16.so:graphics/png		\
 		libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
 RUN_DEPENDS=	bash:shells/bash
@@ -59,7 +59,10 @@ CMAKE_ARGS+=	-DINSTALL_DIR=${OCCROOT}				\
 		-DUSE_FREETYPE:BOOL=ON					\
 		-DUSE_TBB:BOOL=OFF					\
 		-DUSE_RAPIDJSON:BOOL=ON					\
+		-DUSE_DRACO:BOOL=ON					\
 		-DUSE_VTK:BOOL=ON					\
+		-D3RDPARTY_DRACO_LIBRARY_DIR:PATH=${LOCALBASE}/lib	\
+		-D3RDPARTY_DRACO_INCLUDE_DIR:PATH=${LOCALBASE}/include/draco	\
 		-D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTK_VER}
 CONFIGURE_ENV+=	DESTDIR=${STAGEDIR}
 
@@ -80,7 +83,7 @@ CONFLICTS_INSTALL=	opencascade740 # OpenCAS/bin/DRAWEXE
 LOCCROOT=	OpenCAS
 OCCROOT=	${PREFIX}/${LOCCROOT}
 PLIST_SUB=	OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE}	\
-		VE=${PORTVERSION:R:R} VER=${PORTVERSION}
+		VE=${PORTVERSION:R} VER=${DISTVERSION:C/-beta//}
 
 FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=ON
 FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=OFF
@@ -118,7 +121,7 @@ VIS_LIB_DEPENDS=	libftgl.so:graphics/ftgl	\
 VIS_USE=		GL=glesv2
 
 DOXYGEN_IMPLIES=	DOCS
-DOXYGEN_USE=	TEX=latex:build
+DOXYGEN_USE=		TEX=latex:build
 DOXYGEN_BUILD_DEPENDS=	bash:shells/bash		\
 			doxygen:devel/doxygen		\
 			dot:graphics/graphviz		\
@@ -158,7 +161,7 @@ post-build-DOXYGEN-on:
 	(cd ${WRKSRC} && ./gendoc -overview)
 
 post-install:
-	${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/DRAWEXE
+	${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${DISTVERSION:C/-beta//} ${STAGEDIR}${PREFIX}/bin/DRAWEXE
 	(cd ${STAGEDIR}${PREFIX}/bin &&							\
 	${LN} -sf DRAWEXE ${STAGEDIR}${OCCROOT}/bin/DRAWEXE)
 
diff --git a/cad/opencascade/distinfo b/cad/opencascade/distinfo
index c8f9077c1c3c..a7fc1225aadf 100644
--- a/cad/opencascade/distinfo
+++ b/cad/opencascade/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635964606
-SHA256 (opencascade-7.6.0.tgz) = 8dd81ee7b37f38bf930e0c067aa10f027310f3ab896f2925b32a2a2c5e273401
-SIZE (opencascade-7.6.0.tgz) = 230101903
+TIMESTAMP = 1668069465
+SHA256 (opencascade-7.7.0.tgz) = 40e8e0e78b56dd407192b4cabf55dd0bdd1fa9c0a292d263b12f7e21733cb07e
+SIZE (opencascade-7.7.0.tgz) = 247268442
diff --git a/cad/opencascade/files/patch-CMakeLists.txt b/cad/opencascade/files/patch-CMakeLists.txt
index 55efff7a906a..769fd8549c08 100644
--- a/cad/opencascade/files/patch-CMakeLists.txt
+++ b/cad/opencascade/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2021-10-30 11:13:37 UTC
+--- CMakeLists.txt.orig	2022-09-30 11:53:39 UTC
 +++ CMakeLists.txt
-@@ -963,7 +963,7 @@ if (${DRAWEXE_INDEX} GREATER -1)
+@@ -1005,7 +1005,7 @@ if (${DRAWEXE_INDEX} GREATER -1)
              PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
    else()
      install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
@@ -9,7 +9,7 @@
    endif()
  
    # copy draw script to CMake binary folder
-@@ -979,7 +979,7 @@ else()
+@@ -1021,7 +1021,7 @@ endif()
  endif()
  
   # change custom.bat/sh
@@ -18,18 +18,12 @@
    file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
  
    set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
-@@ -1229,7 +1229,13 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPE
+@@ -1265,7 +1265,7 @@ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONF
  endforeach()
  # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
  install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
-+install(CODE "
-+  configure_file(
-+    \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
-+    \"\$ENV{DESTDIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\"
-+    COPYONLY)
-+")
-+
+-install (CODE "file(INSTALL FILES \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" DESTINATION \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/\" TYPE FILE)")
++install (CODE "file(INSTALL FILES \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" DESTINATION \"${INSTALL_DIR_CMAKE}/\" TYPE FILE)")
  
  foreach (OCCT_MODULE ${OCCT_MODULES})
    if (BUILD_MODULE_${OCCT_MODULE})
diff --git a/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake b/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake
index 8ab6018984b8..990e18a58e47 100644
--- a/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake
+++ b/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake
@@ -1,4 +1,4 @@
---- adm/cmake/occt_macros.cmake.orig	2021-10-30 11:13:37 UTC
+--- adm/cmake/occt_macros.cmake.orig	2022-09-30 11:53:39 UTC
 +++ adm/cmake/occt_macros.cmake
 @@ -47,7 +47,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS)
    elseif(APPLE)
@@ -18,12 +18,12 @@
    
    string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
    message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")
-@@ -592,12 +592,12 @@ macro (OCCT_UPDATE_TARGET_FILE)
-   "cmake_policy(PUSH)
-   cmake_policy(SET CMP0007 NEW)
-   string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
+@@ -590,12 +590,12 @@ macro (OCCT_UPDATE_TARGET_FILE)
+ 
+   install (CODE
+   "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
 -  file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
-+  file (GLOB ALL_OCCT_TARGET_FILES \"$ENV{DESTDIR}${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
++  file (GLOB ALL_OCCT_TARGET_FILES \"$ENV{DESTDIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
    foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
      file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
      file (REMOVE \"\${TARGET_FILENAME}\")
@@ -32,4 +32,4 @@
 +      string (REGEX REPLACE \"[\\\\]?[\\\$]{OCCT_INSTALL_BIN_LETTER}\" \"${OCCT_INSTALL_BIN_LETTER}\" line \"\${line}\")
        file (APPEND \"\${TARGET_FILENAME}\" \"\${line}\\n\")
      endforeach()
-   endforeach()
+   endforeach()")
diff --git a/cad/opencascade/files/patch-inc_Standard__Time.hxx b/cad/opencascade/files/patch-inc_Standard__Time.hxx
deleted file mode 100644
index 500d47993eee..000000000000
--- a/cad/opencascade/files/patch-inc_Standard__Time.hxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- inc/Standard_Time.hxx.orig	2017-08-30 13:28:31 UTC
-+++ inc/Standard_Time.hxx
-@@ -26,11 +26,11 @@
- // ------------------------------------------------------------------
- // IsEqual : Returns Standard_True if two time values are equal
- // ------------------------------------------------------------------
--inline Standard_Boolean IsEqual (const Standard_Time theOne,
--                                 const Standard_Time theTwo)
--{
--  return theOne == theTwo;
--}
-+//inline Standard_Boolean IsEqual (const Standard_Time theOne,
-+//                                 const Standard_Time theTwo)
-+//{
-+//  return theOne == theTwo;
-+//}
- 
- #endif
- 
diff --git a/cad/opencascade/files/patch-src_STEPConstruct_STEPConstruct__AP203Context.cxx b/cad/opencascade/files/patch-src_STEPConstruct_STEPConstruct__AP203Context.cxx
index aaa264563964..e9858d5418a8 100644
--- a/cad/opencascade/files/patch-src_STEPConstruct_STEPConstruct__AP203Context.cxx
+++ b/cad/opencascade/files/patch-src_STEPConstruct_STEPConstruct__AP203Context.cxx
@@ -1,6 +1,6 @@
---- src/STEPConstruct/STEPConstruct_AP203Context.cxx.orig	2017-08-30 13:28:30 UTC
+--- src/STEPConstruct/STEPConstruct_AP203Context.cxx.orig	2022-09-30 11:53:57 UTC
 +++ src/STEPConstruct/STEPConstruct_AP203Context.cxx
-@@ -123,7 +123,15 @@ Handle(StepBasic_DateAndTime) STEPConstr
+@@ -121,7 +121,15 @@ Handle(StepBasic_DateAndTime) STEPConstruct_AP203Conte
      long shift = 0;
      _get_timezone (&shift);
    #else
diff --git a/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx b/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx
index 11083adad1b6..5b71f6edf983 100644
--- a/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx
+++ b/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx
@@ -1,6 +1,6 @@
---- src/Standard/Standard_CString.cxx.orig	2021-10-30 11:13:58 UTC
+--- src/Standard/Standard_CString.cxx.orig	2022-09-30 11:54:05 UTC
 +++ src/Standard/Standard_CString.cxx
-@@ -82,7 +82,7 @@ Standard_Integer HashCodes (const Standard_CString the
+@@ -80,7 +80,7 @@ Standard_Integer HashCodes (const Standard_CString the
      // strtod, strtol, strtoll functions. For other system with locale-depended
      // implementations problems may appear if "C" locale is not set explicitly.
      #if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__MINGW32__)
diff --git a/cad/opencascade/files/patch-src_Standard_Standard__Time.hxx b/cad/opencascade/files/patch-src_Standard_Standard__Time.hxx
deleted file mode 100644
index 907ca96e6cd6..000000000000
--- a/cad/opencascade/files/patch-src_Standard_Standard__Time.hxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/Standard/Standard_Time.hxx.orig	2017-08-30 13:28:31 UTC
-+++ src/Standard/Standard_Time.hxx
-@@ -26,11 +26,11 @@
- // ------------------------------------------------------------------
- // IsEqual : Returns Standard_True if two time values are equal
- // ------------------------------------------------------------------
--inline Standard_Boolean IsEqual (const Standard_Time theOne,
--                                 const Standard_Time theTwo)
--{
--  return theOne == theTwo;
--}
-+//inline Standard_Boolean IsEqual (const Standard_Time theOne,
-+//                                 const Standard_Time theTwo)
-+//{
-+//  return theOne == theTwo;
-+//}
- 
- #endif
- 
diff --git a/cad/opencascade/pkg-plist b/cad/opencascade/pkg-plist
index e871d1900eb2..35d15c39d3e1 100644
--- a/cad/opencascade/pkg-plist
+++ b/cad/opencascade/pkg-plist
@@ -1,4 +1,6 @@
 %%OCCROOT%%/bin/DRAWEXE
+%%OCCROOT%%/bin/ExpToCasExe
+%%OCCROOT%%/bin/ExpToCasExe-%%VER%%
 %%OCCROOT%%/bin/custom.sh
 %%OCCROOT%%/bin/custom_%%CC%%_%%BITS%%.sh
 %%OCCROOT%%/bin/draw.sh
@@ -111,9 +113,9 @@
 %%OCCROOT%%/resources/SHMessage/SHMessage_SHAPE_us.pxx
 %%OCCROOT%%/resources/Shaders/Declarations.glsl
 %%OCCROOT%%/resources/Shaders/DeclarationsImpl.glsl
-%%OCCROOT%%/resources/Shaders/DirectionalLightShadow.glsl
 %%OCCROOT%%/resources/Shaders/Display.fs
 %%OCCROOT%%/resources/Shaders/FILES
+%%OCCROOT%%/resources/Shaders/LightShadow.glsl
 %%OCCROOT%%/resources/Shaders/PBRCookTorrance.glsl
 %%OCCROOT%%/resources/Shaders/PBRDirectionalLight.glsl
 %%OCCROOT%%/resources/Shaders/PBRDistribution.glsl
@@ -137,8 +139,8 @@
 %%OCCROOT%%/resources/Shaders/RaytraceSmooth.fs
 %%OCCROOT%%/resources/Shaders/Shaders_DeclarationsImpl_glsl.pxx
 %%OCCROOT%%/resources/Shaders/Shaders_Declarations_glsl.pxx
-%%OCCROOT%%/resources/Shaders/Shaders_DirectionalLightShadow_glsl.pxx
 %%OCCROOT%%/resources/Shaders/Shaders_Display_fs.pxx
+%%OCCROOT%%/resources/Shaders/Shaders_LightShadow_glsl.pxx
 %%OCCROOT%%/resources/Shaders/Shaders_PBRCookTorrance_glsl.pxx
 %%OCCROOT%%/resources/Shaders/Shaders_PBRDirectionalLight_glsl.pxx
 %%OCCROOT%%/resources/Shaders/Shaders_PBRDistribution_glsl.pxx
@@ -158,7 +160,9 @@
 %%OCCROOT%%/resources/Shaders/Shaders_RaytraceBase_vs.pxx
 %%OCCROOT%%/resources/Shaders/Shaders_RaytraceRender_fs.pxx
 %%OCCROOT%%/resources/Shaders/Shaders_RaytraceSmooth_fs.pxx
+%%OCCROOT%%/resources/Shaders/Shaders_SkydomBackground_fs.pxx
 %%OCCROOT%%/resources/Shaders/Shaders_TangentSpaceNormal_glsl.pxx
+%%OCCROOT%%/resources/Shaders/SkydomBackground.fs
 %%OCCROOT%%/resources/Shaders/TangentSpaceNormal.glsl
 %%OCCROOT%%/resources/StdResource/FILES
 %%OCCROOT%%/resources/StdResource/MigrationSheet.txt
@@ -208,6 +212,7 @@
 %%OCCROOT%%/resources/XRResources/occtvr_bindings_holographic_hmd.json
 %%OCCROOT%%/resources/XRResources/occtvr_bindings_index_hmd.json
 %%OCCROOT%%/resources/XRResources/occtvr_bindings_rift.json
+%%OCCROOT%%/resources/XRResources/occtvr_bindings_touch.json
 %%OCCROOT%%/resources/XRResources/occtvr_bindings_vive.json
 %%OCCROOT%%/resources/XRResources/occtvr_bindings_vive_controller.json
 %%OCCROOT%%/resources/XRResources/occtvr_bindings_vive_cosmos.json
@@ -256,8 +261,8 @@
 %%OCCROOT%%/samples/tcl/spheres.tcl
 %%OCCROOT%%/samples/tcl/vis_pbr_spheres.tcl
 %%OCCROOT%%/samples/tcl/xde.tcl
-%%PORTDOCS%%%%OCCROOT%%/%%DOCSDIR%%/LICENSE_LGPL_21.txt
-%%PORTDOCS%%%%OCCROOT%%/%%DOCSDIR%%/OCCT_LGPL_EXCEPTION.txt
+%%DOXYGEN%%%%OCCROOT%%/%%DOCSDIR%%/LICENSE_LGPL_21.txt
+%%DOXYGEN%%%%OCCROOT%%/%%DOCSDIR%%/OCCT_LGPL_EXCEPTION.txt
 %%OCCROOT%%/tests/blend/begin
 %%OCCROOT%%/tests/blend/bfuseblend/A1
 %%OCCROOT%%/tests/blend/bfuseblend/A2
@@ -701,6 +706,7 @@
 %%OCCROOT%%/tests/blend/tolblend_simple/B7
 %%OCCROOT%%/tests/blend/tolblend_simple/B8
 %%OCCROOT%%/tests/blend/tolblend_simple/B9
+%%OCCROOT%%/tests/blend/tolblend_simple/begin
 %%OCCROOT%%/tests/blend/tolblend_simple/C1
 %%OCCROOT%%/tests/blend/tolblend_simple/C2
 %%OCCROOT%%/tests/blend/tolblend_simple/C3
@@ -738,7 +744,6 @@
 %%OCCROOT%%/tests/blend/tolblend_simple/F8
 %%OCCROOT%%/tests/blend/tolblend_simple/F9
 %%OCCROOT%%/tests/blend/tolblend_simple/G1
-%%OCCROOT%%/tests/blend/tolblend_simple/begin
 %%OCCROOT%%/tests/boolean/bcommon_2d/A1
 %%OCCROOT%%/tests/boolean/bcommon_2d/A2
 %%OCCROOT%%/tests/boolean/bcommon_2d/A3
@@ -784,6 +789,7 @@
 %%OCCROOT%%/tests/boolean/bcommon_2d/E7
 %%OCCROOT%%/tests/boolean/bcommon_2d/E8
 %%OCCROOT%%/tests/boolean/bcommon_2d/E9
+%%OCCROOT%%/tests/boolean/bcommon_2d/end
 %%OCCROOT%%/tests/boolean/bcommon_2d/F1
 %%OCCROOT%%/tests/boolean/bcommon_2d/F2
 %%OCCROOT%%/tests/boolean/bcommon_2d/F3
@@ -882,7 +888,6 @@
 %%OCCROOT%%/tests/boolean/bcommon_2d/P6
 %%OCCROOT%%/tests/boolean/bcommon_2d/P7
 %%OCCROOT%%/tests/boolean/bcommon_2d/P8
-%%OCCROOT%%/tests/boolean/bcommon_2d/end
 %%OCCROOT%%/tests/boolean/bcommon_complex/A1
 %%OCCROOT%%/tests/boolean/bcommon_complex/A2
 %%OCCROOT%%/tests/boolean/bcommon_complex/A3
@@ -1036,6 +1041,7 @@
 %%OCCROOT%%/tests/boolean/bcut_2d/E7
 %%OCCROOT%%/tests/boolean/bcut_2d/E8
 %%OCCROOT%%/tests/boolean/bcut_2d/E9
+%%OCCROOT%%/tests/boolean/bcut_2d/end
 %%OCCROOT%%/tests/boolean/bcut_2d/F1
 %%OCCROOT%%/tests/boolean/bcut_2d/F2
 %%OCCROOT%%/tests/boolean/bcut_2d/F3
@@ -1161,7 +1167,6 @@
 %%OCCROOT%%/tests/boolean/bcut_2d/S6
 %%OCCROOT%%/tests/boolean/bcut_2d/S7
 %%OCCROOT%%/tests/boolean/bcut_2d/S8
-%%OCCROOT%%/tests/boolean/bcut_2d/end
 %%OCCROOT%%/tests/boolean/bcut_complex/A1
 %%OCCROOT%%/tests/boolean/bcut_complex/A2
 %%OCCROOT%%/tests/boolean/bcut_complex/A3
@@ -1768,6 +1773,7 @@
 %%OCCROOT%%/tests/boolean/bopcommon_2d/E7
 %%OCCROOT%%/tests/boolean/bopcommon_2d/E8
 %%OCCROOT%%/tests/boolean/bopcommon_2d/E9
+%%OCCROOT%%/tests/boolean/bopcommon_2d/end
 %%OCCROOT%%/tests/boolean/bopcommon_2d/F1
 %%OCCROOT%%/tests/boolean/bopcommon_2d/F2
 %%OCCROOT%%/tests/boolean/bopcommon_2d/F3
@@ -1866,7 +1872,6 @@
 %%OCCROOT%%/tests/boolean/bopcommon_2d/P6
 %%OCCROOT%%/tests/boolean/bopcommon_2d/P7
 %%OCCROOT%%/tests/boolean/bopcommon_2d/P8
-%%OCCROOT%%/tests/boolean/bopcommon_2d/end
 %%OCCROOT%%/tests/boolean/bopcommon_complex/A1
 %%OCCROOT%%/tests/boolean/bopcommon_complex/A2
 %%OCCROOT%%/tests/boolean/bopcommon_complex/A3
@@ -3537,6 +3542,7 @@
 %%OCCROOT%%/tests/boolean/boptuc_2d/E7
 %%OCCROOT%%/tests/boolean/boptuc_2d/E8
 %%OCCROOT%%/tests/boolean/boptuc_2d/E9
+%%OCCROOT%%/tests/boolean/boptuc_2d/end
 %%OCCROOT%%/tests/boolean/boptuc_2d/F1
 %%OCCROOT%%/tests/boolean/boptuc_2d/F2
 %%OCCROOT%%/tests/boolean/boptuc_2d/F3
@@ -3632,7 +3638,6 @@
 %%OCCROOT%%/tests/boolean/boptuc_2d/P3
 %%OCCROOT%%/tests/boolean/boptuc_2d/P4
 %%OCCROOT%%/tests/boolean/boptuc_2d/P5
-%%OCCROOT%%/tests/boolean/boptuc_2d/end
 %%OCCROOT%%/tests/boolean/boptuc_complex/A1
 %%OCCROOT%%/tests/boolean/boptuc_complex/A2
 %%OCCROOT%%/tests/boolean/boptuc_complex/A3
@@ -4281,6 +4286,7 @@
 %%OCCROOT%%/tests/boolean/cells_test/E7
 %%OCCROOT%%/tests/boolean/cells_test/E8
 %%OCCROOT%%/tests/boolean/cells_test/E9
+%%OCCROOT%%/tests/boolean/cells_test/end
 %%OCCROOT%%/tests/boolean/cells_test/F1
 %%OCCROOT%%/tests/boolean/cells_test/F2
 %%OCCROOT%%/tests/boolean/cells_test/F3
@@ -4311,7 +4317,6 @@
 %%OCCROOT%%/tests/boolean/cells_test/J5
 %%OCCROOT%%/tests/boolean/cells_test/J6
 %%OCCROOT%%/tests/boolean/cells_test/K1
-%%OCCROOT%%/tests/boolean/cells_test/end
 %%OCCROOT%%/tests/boolean/end
 %%OCCROOT%%/tests/boolean/gdml_private/A1
 %%OCCROOT%%/tests/boolean/gdml_private/A2
@@ -4331,6 +4336,7 @@
 %%OCCROOT%%/tests/boolean/gdml_private/B7
 %%OCCROOT%%/tests/boolean/gdml_private/B8
 %%OCCROOT%%/tests/boolean/gdml_private/B9
+%%OCCROOT%%/tests/boolean/gdml_private/bug27052_ZI5
 %%OCCROOT%%/tests/boolean/gdml_private/C1
 %%OCCROOT%%/tests/boolean/gdml_private/C2
 %%OCCROOT%%/tests/boolean/gdml_private/C3
@@ -4358,6 +4364,7 @@
 %%OCCROOT%%/tests/boolean/gdml_private/E7
 %%OCCROOT%%/tests/boolean/gdml_private/E8
 %%OCCROOT%%/tests/boolean/gdml_private/E9
+%%OCCROOT%%/tests/boolean/gdml_private/end
 %%OCCROOT%%/tests/boolean/gdml_private/F1
 %%OCCROOT%%/tests/boolean/gdml_private/F2
 %%OCCROOT%%/tests/boolean/gdml_private/F3
@@ -4638,8 +4645,6 @@
 %%OCCROOT%%/tests/boolean/gdml_private/ZK1
 %%OCCROOT%%/tests/boolean/gdml_private/ZK2
 %%OCCROOT%%/tests/boolean/gdml_private/ZK3
-%%OCCROOT%%/tests/boolean/gdml_private/bug27052_ZI5
-%%OCCROOT%%/tests/boolean/gdml_private/end
 %%OCCROOT%%/tests/boolean/gdml_public/A1
 %%OCCROOT%%/tests/boolean/gdml_public/A2
 %%OCCROOT%%/tests/boolean/gdml_public/A3
@@ -4715,6 +4720,7 @@
 %%OCCROOT%%/tests/boolean/removefeatures/B7
 %%OCCROOT%%/tests/boolean/removefeatures/B8
 %%OCCROOT%%/tests/boolean/removefeatures/B9
+%%OCCROOT%%/tests/boolean/removefeatures/begin
 %%OCCROOT%%/tests/boolean/removefeatures/C1
 %%OCCROOT%%/tests/boolean/removefeatures/C2
 %%OCCROOT%%/tests/boolean/removefeatures/C3
@@ -4755,7 +4761,6 @@
 %%OCCROOT%%/tests/boolean/removefeatures/G2
 %%OCCROOT%%/tests/boolean/removefeatures/G3
 %%OCCROOT%%/tests/boolean/removefeatures/G4
-%%OCCROOT%%/tests/boolean/removefeatures/begin
 %%OCCROOT%%/tests/boolean/simplify/A1
 %%OCCROOT%%/tests/boolean/simplify/A2
 %%OCCROOT%%/tests/boolean/simplify/A3
@@ -4818,6 +4823,7 @@
 %%OCCROOT%%/tests/boolean/volumemaker/E7
 %%OCCROOT%%/tests/boolean/volumemaker/E8
 %%OCCROOT%%/tests/boolean/volumemaker/E9
+%%OCCROOT%%/tests/boolean/volumemaker/end
 %%OCCROOT%%/tests/boolean/volumemaker/F1
 %%OCCROOT%%/tests/boolean/volumemaker/F2
 %%OCCROOT%%/tests/boolean/volumemaker/F3
@@ -4847,7 +4853,6 @@
 %%OCCROOT%%/tests/boolean/volumemaker/H9
 %%OCCROOT%%/tests/boolean/volumemaker/I1
 %%OCCROOT%%/tests/boolean/volumemaker/I2
-%%OCCROOT%%/tests/boolean/volumemaker/end
 %%OCCROOT%%/tests/bugs/begin
 %%OCCROOT%%/tests/bugs/caf/begin
 %%OCCROOT%%/tests/bugs/caf/buc60756
@@ -5007,12 +5012,12 @@
 %%OCCROOT%%/tests/bugs/caf/bug425
 %%OCCROOT%%/tests/bugs/caf/bug644
 %%OCCROOT%%/tests/bugs/caf/bug669
-%%OCCROOT%%/tests/bugs/caf/bug738_1
-%%OCCROOT%%/tests/bugs/caf/bug738_2
-%%OCCROOT%%/tests/bugs/caf/bug739
 %%OCCROOT%%/tests/bugs/caf/bug73_1
 %%OCCROOT%%/tests/bugs/caf/bug73_2
 %%OCCROOT%%/tests/bugs/caf/bug73_3
+%%OCCROOT%%/tests/bugs/caf/bug738_1
+%%OCCROOT%%/tests/bugs/caf/bug738_2
+%%OCCROOT%%/tests/bugs/caf/bug739
 %%OCCROOT%%/tests/bugs/caf/bug9746
 %%OCCROOT%%/tests/bugs/demo/begin
 %%OCCROOT%%/tests/bugs/demo/bug14673_1
@@ -5119,7 +5124,9 @@
 %%OCCROOT%%/tests/bugs/fclasses/bug28829
 %%OCCROOT%%/tests/bugs/fclasses/bug29064
 %%OCCROOT%%/tests/bugs/fclasses/bug29355
+%%OCCROOT%%/tests/bugs/fclasses/bug29406
 %%OCCROOT%%/tests/bugs/fclasses/bug29925
+%%OCCROOT%%/tests/bugs/fclasses/bug30492
 %%OCCROOT%%/tests/bugs/fclasses/bug30536
 %%OCCROOT%%/tests/bugs/fclasses/bug30762
 %%OCCROOT%%/tests/bugs/fclasses/bug30775
@@ -5134,6 +5141,8 @@
 %%OCCROOT%%/tests/bugs/fclasses/bug31381
 %%OCCROOT%%/tests/bugs/fclasses/bug31697
 %%OCCROOT%%/tests/bugs/fclasses/bug32601
+%%OCCROOT%%/tests/bugs/fclasses/bug32960
+%%OCCROOT%%/tests/bugs/fclasses/bug33048
 %%OCCROOT%%/tests/bugs/fclasses/bug6143
 %%OCCROOT%%/tests/bugs/fclasses/bug63
 %%OCCROOT%%/tests/bugs/fclasses/bug670
@@ -5149,9 +5158,9 @@
 %%OCCROOT%%/tests/bugs/fclasses/bug902
 %%OCCROOT%%/tests/bugs/fclasses/bug983
 %%OCCROOT%%/tests/bugs/fclasses/bug984
+%%OCCROOT%%/tests/bugs/fclasses/bug984_1
 %%OCCROOT%%/tests/bugs/fclasses/bug9848_1
 %%OCCROOT%%/tests/bugs/fclasses/bug9848_2
-%%OCCROOT%%/tests/bugs/fclasses/bug984_1
 %%OCCROOT%%/tests/bugs/filling/begin
 %%OCCROOT%%/tests/bugs/filling/bug13904
 %%OCCROOT%%/tests/bugs/filling/bug16119
@@ -5277,7 +5286,9 @@
 %%OCCROOT%%/tests/bugs/heal/bug28595
 %%OCCROOT%%/tests/bugs/heal/bug28768
 %%OCCROOT%%/tests/bugs/heal/bug28995
-%%OCCROOT%%/tests/bugs/heal/bug29382
+%%OCCROOT%%/tests/bugs/heal/bug29382_1
+%%OCCROOT%%/tests/bugs/heal/bug29382_2
+%%OCCROOT%%/tests/bugs/heal/bug29382_3
 %%OCCROOT%%/tests/bugs/heal/bug29502
 %%OCCROOT%%/tests/bugs/heal/bug29504_1
 %%OCCROOT%%/tests/bugs/heal/bug29504_2
@@ -5316,7 +5327,12 @@
 %%OCCROOT%%/tests/bugs/heal/bug32581
 %%OCCROOT%%/tests/bugs/heal/bug32619
 %%OCCROOT%%/tests/bugs/heal/bug32623
+%%OCCROOT%%/tests/bugs/heal/bug32719
+%%OCCROOT%%/tests/bugs/heal/bug32814_1
+%%OCCROOT%%/tests/bugs/heal/bug32814_2
 %%OCCROOT%%/tests/bugs/heal/bug329
+%%OCCROOT%%/tests/bugs/heal/bug33006
+%%OCCROOT%%/tests/bugs/heal/bug33028
 %%OCCROOT%%/tests/bugs/heal/bug482
 %%OCCROOT%%/tests/bugs/heal/bug518
 %%OCCROOT%%/tests/bugs/heal/bug7570
@@ -5395,6 +5411,7 @@
 %%OCCROOT%%/tests/bugs/iges/bug25843_iges
 %%OCCROOT%%/tests/bugs/iges/bug26047
 %%OCCROOT%%/tests/bugs/iges/bug26138
+%%OCCROOT%%/tests/bugs/iges/bug26174
 %%OCCROOT%%/tests/bugs/iges/bug26419_1
 %%OCCROOT%%/tests/bugs/iges/bug26419_2
 %%OCCROOT%%/tests/bugs/iges/bug26573
@@ -5418,6 +5435,8 @@
 %%OCCROOT%%/tests/bugs/iges/bug28694_8
 %%OCCROOT%%/tests/bugs/iges/bug28694_9
 %%OCCROOT%%/tests/bugs/iges/bug29391
+%%OCCROOT%%/tests/bugs/iges/bug29435
+%%OCCROOT%%/tests/bugs/iges/bug29435_1
 %%OCCROOT%%/tests/bugs/iges/bug29526
 %%OCCROOT%%/tests/bugs/iges/bug30356
 %%OCCROOT%%/tests/bugs/iges/bug30544
@@ -5632,6 +5651,7 @@
 %%OCCROOT%%/tests/bugs/mesh/bug28719
 %%OCCROOT%%/tests/bugs/mesh/bug29149
 %%OCCROOT%%/tests/bugs/mesh/bug29205
+%%OCCROOT%%/tests/bugs/mesh/bug29641
 %%OCCROOT%%/tests/bugs/mesh/bug29685
 %%OCCROOT%%/tests/bugs/mesh/bug29715
 %%OCCROOT%%/tests/bugs/mesh/bug29751
@@ -5642,6 +5662,7 @@
 %%OCCROOT%%/tests/bugs/mesh/bug30149
 %%OCCROOT%%/tests/bugs/mesh/bug30167
 %%OCCROOT%%/tests/bugs/mesh/bug30234
+%%OCCROOT%%/tests/bugs/mesh/bug30442
 %%OCCROOT%%/tests/bugs/mesh/bug30780
 %%OCCROOT%%/tests/bugs/mesh/bug30785
 %%OCCROOT%%/tests/bugs/mesh/bug31125
@@ -5654,9 +5675,26 @@
 %%OCCROOT%%/tests/bugs/mesh/bug31251
 %%OCCROOT%%/tests/bugs/mesh/bug31258
 %%OCCROOT%%/tests/bugs/mesh/bug31378
+%%OCCROOT%%/tests/bugs/mesh/bug31449_1
+%%OCCROOT%%/tests/bugs/mesh/bug31449_2
+%%OCCROOT%%/tests/bugs/mesh/bug31449_3
 %%OCCROOT%%/tests/bugs/mesh/bug31461
+%%OCCROOT%%/tests/bugs/mesh/bug31476
+%%OCCROOT%%/tests/bugs/mesh/bug31853
+%%OCCROOT%%/tests/bugs/mesh/bug31926
+%%OCCROOT%%/tests/bugs/mesh/bug32053
+%%OCCROOT%%/tests/bugs/mesh/bug32241
+%%OCCROOT%%/tests/bugs/mesh/bug32422
 %%OCCROOT%%/tests/bugs/mesh/bug32424
 %%OCCROOT%%/tests/bugs/mesh/bug32471
+%%OCCROOT%%/tests/bugs/mesh/bug32692_1
+%%OCCROOT%%/tests/bugs/mesh/bug32692_2
+%%OCCROOT%%/tests/bugs/mesh/bug32692_3
+%%OCCROOT%%/tests/bugs/mesh/bug32767
+%%OCCROOT%%/tests/bugs/mesh/bug32982_1
+%%OCCROOT%%/tests/bugs/mesh/bug32982_2
+%%OCCROOT%%/tests/bugs/mesh/bug33050
+%%OCCROOT%%/tests/bugs/mesh/bug33060
 %%OCCROOT%%/tests/bugs/mesh/parse.rules
 %%OCCROOT%%/tests/bugs/modalg_1/begin
 %%OCCROOT%%/tests/bugs/modalg_1/buc60409_1
@@ -5744,9 +5782,9 @@
 %%OCCROOT%%/tests/bugs/modalg_1/bug100
 %%OCCROOT%%/tests/bugs/modalg_1/bug101
 %%OCCROOT%%/tests/bugs/modalg_1/bug1013
-%%OCCROOT%%/tests/bugs/modalg_1/bug10232
 %%OCCROOT%%/tests/bugs/modalg_1/bug102_1
 %%OCCROOT%%/tests/bugs/modalg_1/bug102_2
+%%OCCROOT%%/tests/bugs/modalg_1/bug10232
 %%OCCROOT%%/tests/bugs/modalg_1/bug10435_1
 %%OCCROOT%%/tests/bugs/modalg_1/bug10435_2
 %%OCCROOT%%/tests/bugs/modalg_1/bug10605_1
@@ -5783,13 +5821,13 @@
 %%OCCROOT%%/tests/bugs/modalg_1/bug118
 %%OCCROOT%%/tests/bugs/modalg_1/bug118_1
 %%OCCROOT%%/tests/bugs/modalg_1/bug118_2
-%%OCCROOT%%/tests/bugs/modalg_1/bug12213
-%%OCCROOT%%/tests/bugs/modalg_1/bug12257
-%%OCCROOT%%/tests/bugs/modalg_1/bug1226
 %%OCCROOT%%/tests/bugs/modalg_1/bug122_1
 %%OCCROOT%%/tests/bugs/modalg_1/bug122_2
 %%OCCROOT%%/tests/bugs/modalg_1/bug122_3
 %%OCCROOT%%/tests/bugs/modalg_1/bug122_4
+%%OCCROOT%%/tests/bugs/modalg_1/bug12213
+%%OCCROOT%%/tests/bugs/modalg_1/bug12257
+%%OCCROOT%%/tests/bugs/modalg_1/bug1226
 %%OCCROOT%%/tests/bugs/modalg_1/bug123_1
 %%OCCROOT%%/tests/bugs/modalg_1/bug123_2
 %%OCCROOT%%/tests/bugs/modalg_1/bug1243_1
@@ -5834,7 +5872,6 @@
 %%OCCROOT%%/tests/bugs/modalg_1/bug14536
 %%OCCROOT%%/tests/bugs/modalg_1/bug1456
 %%OCCROOT%%/tests/bugs/modalg_1/bug14643
-%%OCCROOT%%/tests/bugs/modalg_1/bug14777
 %%OCCROOT%%/tests/bugs/modalg_1/bug1477_1
 %%OCCROOT%%/tests/bugs/modalg_1/bug1477_10
 %%OCCROOT%%/tests/bugs/modalg_1/bug1477_11
@@ -5847,6 +5884,7 @@
 %%OCCROOT%%/tests/bugs/modalg_1/bug1477_7
 %%OCCROOT%%/tests/bugs/modalg_1/bug1477_8
 %%OCCROOT%%/tests/bugs/modalg_1/bug1477_9
+%%OCCROOT%%/tests/bugs/modalg_1/bug14777
 %%OCCROOT%%/tests/bugs/modalg_1/bug14780
 %%OCCROOT%%/tests/bugs/modalg_1/bug15036
 %%OCCROOT%%/tests/bugs/modalg_1/bug15836
@@ -5925,6 +5963,9 @@
 %%OCCROOT%%/tests/bugs/modalg_2/bug21
 %%OCCROOT%%/tests/bugs/modalg_2/bug21060
 %%OCCROOT%%/tests/bugs/modalg_2/bug212
+%%OCCROOT%%/tests/bugs/modalg_2/bug212_1
+%%OCCROOT%%/tests/bugs/modalg_2/bug212_2
+%%OCCROOT%%/tests/bugs/modalg_2/bug212_3
 %%OCCROOT%%/tests/bugs/modalg_2/bug21255
 %%OCCROOT%%/tests/bugs/modalg_2/bug21261_1
 %%OCCROOT%%/tests/bugs/modalg_2/bug21261_10
@@ -5972,9 +6013,6 @@
 %%OCCROOT%%/tests/bugs/modalg_2/bug21261_7
 %%OCCROOT%%/tests/bugs/modalg_2/bug21261_8
 %%OCCROOT%%/tests/bugs/modalg_2/bug21261_9
-%%OCCROOT%%/tests/bugs/modalg_2/bug212_1
-%%OCCROOT%%/tests/bugs/modalg_2/bug212_2
-%%OCCROOT%%/tests/bugs/modalg_2/bug212_3
 %%OCCROOT%%/tests/bugs/modalg_2/bug213
 %%OCCROOT%%/tests/bugs/modalg_2/bug213_1
 %%OCCROOT%%/tests/bugs/modalg_2/bug213_2
@@ -5984,11 +6022,11 @@
 %%OCCROOT%%/tests/bugs/modalg_2/bug21540
 %%OCCROOT%%/tests/bugs/modalg_2/bug21652_1
 %%OCCROOT%%/tests/bugs/modalg_2/bug21652_2
-%%OCCROOT%%/tests/bugs/modalg_2/bug21722
 %%OCCROOT%%/tests/bugs/modalg_2/bug2172_1
 %%OCCROOT%%/tests/bugs/modalg_2/bug2172_2
 %%OCCROOT%%/tests/bugs/modalg_2/bug2172_3
 %%OCCROOT%%/tests/bugs/modalg_2/bug2172_4
+%%OCCROOT%%/tests/bugs/modalg_2/bug21722
 %%OCCROOT%%/tests/bugs/modalg_2/bug21754
 %%OCCROOT%%/tests/bugs/modalg_2/bug21909
 %%OCCROOT%%/tests/bugs/modalg_2/bug221
@@ -6329,14 +6367,14 @@
 %%OCCROOT%%/tests/bugs/modalg_2/bug539_1
 %%OCCROOT%%/tests/bugs/modalg_2/bug539_2
 %%OCCROOT%%/tests/bugs/modalg_2/bug548
+%%OCCROOT%%/tests/bugs/modalg_2/bug57_1
+%%OCCROOT%%/tests/bugs/modalg_2/bug57_2
 %%OCCROOT%%/tests/bugs/modalg_2/bug570
 %%OCCROOT%%/tests/bugs/modalg_2/bug571_1
 %%OCCROOT%%/tests/bugs/modalg_2/bug571_2
 %%OCCROOT%%/tests/bugs/modalg_2/bug5729
 %%OCCROOT%%/tests/bugs/modalg_2/bug578_1
 %%OCCROOT%%/tests/bugs/modalg_2/bug578_2
-%%OCCROOT%%/tests/bugs/modalg_2/bug57_1
-%%OCCROOT%%/tests/bugs/modalg_2/bug57_2
 %%OCCROOT%%/tests/bugs/modalg_2/bug5805_1
 %%OCCROOT%%/tests/bugs/modalg_2/bug5805_10
 %%OCCROOT%%/tests/bugs/modalg_2/bug5805_11
@@ -6397,16 +6435,16 @@
 %%OCCROOT%%/tests/bugs/modalg_3/bug5805_7
 %%OCCROOT%%/tests/bugs/modalg_3/bug5805_8
 %%OCCROOT%%/tests/bugs/modalg_3/bug5805_9
-%%OCCROOT%%/tests/bugs/modalg_3/bug594
 %%OCCROOT%%/tests/bugs/modalg_3/bug59_1
 %%OCCROOT%%/tests/bugs/modalg_3/bug59_2
+%%OCCROOT%%/tests/bugs/modalg_3/bug594
 %%OCCROOT%%/tests/bugs/modalg_3/bug600
 %%OCCROOT%%/tests/bugs/modalg_3/bug602
 %%OCCROOT%%/tests/bugs/modalg_3/bug605
-%%OCCROOT%%/tests/bugs/modalg_3/bug6063
-%%OCCROOT%%/tests/bugs/modalg_3/bug6063_1
 %%OCCROOT%%/tests/bugs/modalg_3/bug606_1
 %%OCCROOT%%/tests/bugs/modalg_3/bug606_2
+%%OCCROOT%%/tests/bugs/modalg_3/bug6063
+%%OCCROOT%%/tests/bugs/modalg_3/bug6063_1
 %%OCCROOT%%/tests/bugs/modalg_3/bug615
 %%OCCROOT%%/tests/bugs/modalg_3/bug616
 %%OCCROOT%%/tests/bugs/modalg_3/bug698
@@ -6464,9 +6502,9 @@
 %%OCCROOT%%/tests/bugs/modalg_4/bug6766_2
 %%OCCROOT%%/tests/bugs/modalg_4/bug6766_3
 %%OCCROOT%%/tests/bugs/modalg_4/bug6766_4
-%%OCCROOT%%/tests/bugs/modalg_4/bug6811
 %%OCCROOT%%/tests/bugs/modalg_4/bug68_1
 %%OCCROOT%%/tests/bugs/modalg_4/bug68_2
+%%OCCROOT%%/tests/bugs/modalg_4/bug6811
 %%OCCROOT%%/tests/bugs/modalg_4/bug693
 %%OCCROOT%%/tests/bugs/modalg_4/bug693_1
 %%OCCROOT%%/tests/bugs/modalg_4/bug697_1
@@ -6506,6 +6544,8 @@
 %%OCCROOT%%/tests/bugs/modalg_4/bug763
 %%OCCROOT%%/tests/bugs/modalg_4/bug7668
 %%OCCROOT%%/tests/bugs/modalg_4/bug767
+%%OCCROOT%%/tests/bugs/modalg_4/bug77_1
+%%OCCROOT%%/tests/bugs/modalg_4/bug77_2
 %%OCCROOT%%/tests/bugs/modalg_4/bug770
 %%OCCROOT%%/tests/bugs/modalg_4/bug771
 %%OCCROOT%%/tests/bugs/modalg_4/bug772
@@ -6517,8 +6557,6 @@
 %%OCCROOT%%/tests/bugs/modalg_4/bug778_1
 %%OCCROOT%%/tests/bugs/modalg_4/bug778_2
 %%OCCROOT%%/tests/bugs/modalg_4/bug779
-%%OCCROOT%%/tests/bugs/modalg_4/bug77_1
-%%OCCROOT%%/tests/bugs/modalg_4/bug77_2
 %%OCCROOT%%/tests/bugs/modalg_4/bug78
 %%OCCROOT%%/tests/bugs/modalg_4/bug780_1
 %%OCCROOT%%/tests/bugs/modalg_4/bug780_2
@@ -6532,9 +6570,10 @@
 %%OCCROOT%%/tests/bugs/modalg_4/bug817_2
 %%OCCROOT%%/tests/bugs/modalg_4/bug817_3
 %%OCCROOT%%/tests/bugs/modalg_4/bug82
-%%OCCROOT%%/tests/bugs/modalg_4/bug8228
+%%OCCROOT%%/tests/bugs/modalg_4/bug82_1
 %%OCCROOT%%/tests/bugs/modalg_4/bug822_1
 %%OCCROOT%%/tests/bugs/modalg_4/bug822_2
+%%OCCROOT%%/tests/bugs/modalg_4/bug8228
 %%OCCROOT%%/tests/bugs/modalg_4/bug823
 %%OCCROOT%%/tests/bugs/modalg_4/bug824
 %%OCCROOT%%/tests/bugs/modalg_4/bug825
@@ -6543,7 +6582,6 @@
 %%OCCROOT%%/tests/bugs/modalg_4/bug828
 %%OCCROOT%%/tests/bugs/modalg_4/bug829_1
 %%OCCROOT%%/tests/bugs/modalg_4/bug829_2
-%%OCCROOT%%/tests/bugs/modalg_4/bug82_1
 %%OCCROOT%%/tests/bugs/modalg_4/bug8370
 %%OCCROOT%%/tests/bugs/modalg_4/bug8372
 %%OCCROOT%%/tests/bugs/modalg_4/bug86
@@ -6677,6 +6715,8 @@
 %%OCCROOT%%/tests/bugs/modalg_5/bug23708
 %%OCCROOT%%/tests/bugs/modalg_5/bug23782
 %%OCCROOT%%/tests/bugs/modalg_5/bug23785
+%%OCCROOT%%/tests/bugs/modalg_5/bug23820_1
+%%OCCROOT%%/tests/bugs/modalg_5/bug23820_2
 %%OCCROOT%%/tests/bugs/modalg_5/bug23823
 %%OCCROOT%%/tests/bugs/modalg_5/bug23824_1
 %%OCCROOT%%/tests/bugs/modalg_5/bug23824_2
@@ -6834,6 +6874,7 @@
 %%OCCROOT%%/tests/bugs/modalg_5/bug24654
 %%OCCROOT%%/tests/bugs/modalg_5/bug24655
 %%OCCROOT%%/tests/bugs/modalg_5/bug24656
+%%OCCROOT%%/tests/bugs/modalg_5/bug24657
 %%OCCROOT%%/tests/bugs/modalg_5/bug24667
 %%OCCROOT%%/tests/bugs/modalg_5/bug24684
 %%OCCROOT%%/tests/bugs/modalg_5/bug24706
@@ -7599,6 +7640,7 @@
 %%OCCROOT%%/tests/bugs/modalg_6/bug28782
 %%OCCROOT%%/tests/bugs/modalg_6/bug28795
 %%OCCROOT%%/tests/bugs/modalg_6/bug31047
+%%OCCROOT%%/tests/bugs/modalg_6/bug32876
 %%OCCROOT%%/tests/bugs/modalg_6/bug6768
 %%OCCROOT%%/tests/bugs/modalg_6/bug7093
 %%OCCROOT%%/tests/bugs/modalg_6/bug8040
@@ -7663,6 +7705,7 @@
 %%OCCROOT%%/tests/bugs/modalg_7/bug25082_2
 %%OCCROOT%%/tests/bugs/modalg_7/bug25104
 %%OCCROOT%%/tests/bugs/modalg_7/bug25206
+%%OCCROOT%%/tests/bugs/modalg_7/bug25309
 %%OCCROOT%%/tests/bugs/modalg_7/bug25385
 %%OCCROOT%%/tests/bugs/modalg_7/bug25395_1
 %%OCCROOT%%/tests/bugs/modalg_7/bug25395_2
@@ -7970,6 +8013,7 @@
 %%OCCROOT%%/tests/bugs/modalg_7/bug29968
 %%OCCROOT%%/tests/bugs/modalg_7/bug29973_1
 %%OCCROOT%%/tests/bugs/modalg_7/bug29973_2
+%%OCCROOT%%/tests/bugs/modalg_7/bug30054
 %%OCCROOT%%/tests/bugs/modalg_7/bug30090
 %%OCCROOT%%/tests/bugs/modalg_7/bug30092
 %%OCCROOT%%/tests/bugs/modalg_7/bug30140
@@ -8010,6 +8054,7 @@
 %%OCCROOT%%/tests/bugs/modalg_7/bug30395
 %%OCCROOT%%/tests/bugs/modalg_7/bug30396_1
 %%OCCROOT%%/tests/bugs/modalg_7/bug30396_2
+%%OCCROOT%%/tests/bugs/modalg_7/bug30398
 %%OCCROOT%%/tests/bugs/modalg_7/bug30433
 %%OCCROOT%%/tests/bugs/modalg_7/bug30490
 %%OCCROOT%%/tests/bugs/modalg_7/bug30522
@@ -8100,6 +8145,7 @@
 %%OCCROOT%%/tests/bugs/modalg_7/bug31260
 %%OCCROOT%%/tests/bugs/modalg_7/bug31294
 %%OCCROOT%%/tests/bugs/modalg_7/bug31306
+%%OCCROOT%%/tests/bugs/modalg_7/bug31361
 %%OCCROOT%%/tests/bugs/modalg_7/bug31404
 %%OCCROOT%%/tests/bugs/modalg_7/bug31407_1
 %%OCCROOT%%/tests/bugs/modalg_7/bug31407_2
@@ -8143,6 +8189,7 @@
 %%OCCROOT%%/tests/bugs/modalg_7/bug31913
 %%OCCROOT%%/tests/bugs/modalg_7/bug31974
 %%OCCROOT%%/tests/bugs/modalg_7/bug31984
+%%OCCROOT%%/tests/bugs/modalg_7/bug32066
 %%OCCROOT%%/tests/bugs/modalg_7/bug32106
 %%OCCROOT%%/tests/bugs/modalg_7/bug32108
 %%OCCROOT%%/tests/bugs/modalg_7/bug32136
@@ -8151,15 +8198,62 @@
 %%OCCROOT%%/tests/bugs/modalg_7/bug32291
 %%OCCROOT%%/tests/bugs/modalg_7/bug32330
 %%OCCROOT%%/tests/bugs/modalg_7/bug32444
+%%OCCROOT%%/tests/bugs/modalg_7/bug32445
+%%OCCROOT%%/tests/bugs/modalg_7/bug32446
+%%OCCROOT%%/tests/bugs/modalg_7/bug32447_1
+%%OCCROOT%%/tests/bugs/modalg_7/bug32447_2
+%%OCCROOT%%/tests/bugs/modalg_7/bug32447_3
+%%OCCROOT%%/tests/bugs/modalg_7/bug32447_4
 %%OCCROOT%%/tests/bugs/modalg_7/bug32470
 %%OCCROOT%%/tests/bugs/modalg_7/bug32502
 %%OCCROOT%%/tests/bugs/modalg_7/bug32569
 %%OCCROOT%%/tests/bugs/modalg_7/bug32578
+%%OCCROOT%%/tests/bugs/modalg_7/bug32644
+%%OCCROOT%%/tests/bugs/modalg_7/bug32691
+%%OCCROOT%%/tests/bugs/modalg_7/bug32717
+%%OCCROOT%%/tests/bugs/modalg_7/bug32744
+%%OCCROOT%%/tests/bugs/modalg_7/bug32863
+%%OCCROOT%%/tests/bugs/modalg_7/bug32874_1
+%%OCCROOT%%/tests/bugs/modalg_7/bug32874_2
+%%OCCROOT%%/tests/bugs/modalg_7/bug32874_3
+%%OCCROOT%%/tests/bugs/modalg_7/bug32874_4
+%%OCCROOT%%/tests/bugs/modalg_7/bug32874_5
+%%OCCROOT%%/tests/bugs/modalg_7/bug32877
 %%OCCROOT%%/tests/bugs/modalg_7/bug5081_1
 %%OCCROOT%%/tests/bugs/modalg_7/bug5081_2
 %%OCCROOT%%/tests/bugs/modalg_7/bug5582
 %%OCCROOT%%/tests/bugs/modalg_7/bug83
 %%OCCROOT%%/tests/bugs/modalg_7/optimal_bndbox_exception
+%%OCCROOT%%/tests/bugs/modalg_8/bug30160
+%%OCCROOT%%/tests/bugs/modalg_8/bug30955
+%%OCCROOT%%/tests/bugs/modalg_8/bug31479_1
+%%OCCROOT%%/tests/bugs/modalg_8/bug31479_2
+%%OCCROOT%%/tests/bugs/modalg_8/bug31992
+%%OCCROOT%%/tests/bugs/modalg_8/bug32214_1
+%%OCCROOT%%/tests/bugs/modalg_8/bug32214_2
+%%OCCROOT%%/tests/bugs/modalg_8/bug32214_3
+%%OCCROOT%%/tests/bugs/modalg_8/bug32214_4
+%%OCCROOT%%/tests/bugs/modalg_8/bug32214_5
+%%OCCROOT%%/tests/bugs/modalg_8/bug32214_6
+%%OCCROOT%%/tests/bugs/modalg_8/bug32716_1
+%%OCCROOT%%/tests/bugs/modalg_8/bug32716_2
+%%OCCROOT%%/tests/bugs/modalg_8/bug32716_3
+%%OCCROOT%%/tests/bugs/modalg_8/bug32716_4
+%%OCCROOT%%/tests/bugs/modalg_8/bug32721
+%%OCCROOT%%/tests/bugs/modalg_8/bug32859
+%%OCCROOT%%/tests/bugs/modalg_8/bug32864
+%%OCCROOT%%/tests/bugs/modalg_8/bug32915
+%%OCCROOT%%/tests/bugs/modalg_8/bug32929
+%%OCCROOT%%/tests/bugs/modalg_8/bug32930
+%%OCCROOT%%/tests/bugs/modalg_8/bug32931
+%%OCCROOT%%/tests/bugs/modalg_8/bug32942
+%%OCCROOT%%/tests/bugs/modalg_8/bug32943
+%%OCCROOT%%/tests/bugs/modalg_8/bug32944
+%%OCCROOT%%/tests/bugs/modalg_8/bug32945
+%%OCCROOT%%/tests/bugs/modalg_8/bug32973
+%%OCCROOT%%/tests/bugs/modalg_8/bug33080
+%%OCCROOT%%/tests/bugs/modalg_8/bug33104
+%%OCCROOT%%/tests/bugs/modalg_8/bug33165
 %%OCCROOT%%/tests/bugs/moddata_1/begin
 %%OCCROOT%%/tests/bugs/moddata_1/buc60637
 %%OCCROOT%%/tests/bugs/moddata_1/buc60652_1
@@ -8244,10 +8338,10 @@
 %%OCCROOT%%/tests/bugs/moddata_1/bug163
 %%OCCROOT%%/tests/bugs/moddata_1/bug164_1
 %%OCCROOT%%/tests/bugs/moddata_1/bug164_2
-%%OCCROOT%%/tests/bugs/moddata_1/bug1651
 %%OCCROOT%%/tests/bugs/moddata_1/bug165_1
 %%OCCROOT%%/tests/bugs/moddata_1/bug165_2
 %%OCCROOT%%/tests/bugs/moddata_1/bug165_3
+%%OCCROOT%%/tests/bugs/moddata_1/bug1651
 %%OCCROOT%%/tests/bugs/moddata_1/bug17
 %%OCCROOT%%/tests/bugs/moddata_1/bug17046
 %%OCCROOT%%/tests/bugs/moddata_1/bug17424
@@ -8275,10 +8369,10 @@
 %%OCCROOT%%/tests/bugs/moddata_1/bug20904_1
 %%OCCROOT%%/tests/bugs/moddata_1/bug20904_2
 %%OCCROOT%%/tests/bugs/moddata_1/bug20904_3
-%%OCCROOT%%/tests/bugs/moddata_1/bug21121
-%%OCCROOT%%/tests/bugs/moddata_1/bug21122
 %%OCCROOT%%/tests/bugs/moddata_1/bug211_1
 %%OCCROOT%%/tests/bugs/moddata_1/bug211_2
+%%OCCROOT%%/tests/bugs/moddata_1/bug21121
+%%OCCROOT%%/tests/bugs/moddata_1/bug21122
 %%OCCROOT%%/tests/bugs/moddata_1/bug217
 %%OCCROOT%%/tests/bugs/moddata_1/bug22039
 %%OCCROOT%%/tests/bugs/moddata_1/bug22043
@@ -8298,6 +8392,8 @@
 %%OCCROOT%%/tests/bugs/moddata_1/bug22554_4
 %%OCCROOT%%/tests/bugs/moddata_1/bug22623
 %%OCCROOT%%/tests/bugs/moddata_1/bug22694
+%%OCCROOT%%/tests/bugs/moddata_1/bug227_1
+%%OCCROOT%%/tests/bugs/moddata_1/bug227_2
 %%OCCROOT%%/tests/bugs/moddata_1/bug22703
 %%OCCROOT%%/tests/bugs/moddata_1/bug22726
 %%OCCROOT%%/tests/bugs/moddata_1/bug22733
@@ -8306,8 +8402,6 @@
 %%OCCROOT%%/tests/bugs/moddata_1/bug22759
 %%OCCROOT%%/tests/bugs/moddata_1/bug22761
 %%OCCROOT%%/tests/bugs/moddata_1/bug22789
-%%OCCROOT%%/tests/bugs/moddata_1/bug227_1
-%%OCCROOT%%/tests/bugs/moddata_1/bug227_2
 %%OCCROOT%%/tests/bugs/moddata_1/bug54
 %%OCCROOT%%/tests/bugs/moddata_2/begin
 %%OCCROOT%%/tests/bugs/moddata_2/bug22572
@@ -8356,25 +8450,27 @@
 %%OCCROOT%%/tests/bugs/moddata_2/bug258_1
 %%OCCROOT%%/tests/bugs/moddata_2/bug258_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug259
+%%OCCROOT%%/tests/bugs/moddata_2/bug26_1
+%%OCCROOT%%/tests/bugs/moddata_2/bug26_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug262
 %%OCCROOT%%/tests/bugs/moddata_2/bug265
 %%OCCROOT%%/tests/bugs/moddata_2/bug266
 %%OCCROOT%%/tests/bugs/moddata_2/bug268
-%%OCCROOT%%/tests/bugs/moddata_2/bug26_1
-%%OCCROOT%%/tests/bugs/moddata_2/bug26_2
+%%OCCROOT%%/tests/bugs/moddata_2/bug27_1
+%%OCCROOT%%/tests/bugs/moddata_2/bug27_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug2755
 %%OCCROOT%%/tests/bugs/moddata_2/bug277
-%%OCCROOT%%/tests/bugs/moddata_2/bug2784_1
-%%OCCROOT%%/tests/bugs/moddata_2/bug2784_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug278_1
 %%OCCROOT%%/tests/bugs/moddata_2/bug278_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug278_3
-%%OCCROOT%%/tests/bugs/moddata_2/bug27_1
-%%OCCROOT%%/tests/bugs/moddata_2/bug27_2
-%%OCCROOT%%/tests/bugs/moddata_2/bug284
+%%OCCROOT%%/tests/bugs/moddata_2/bug2784_1
+%%OCCROOT%%/tests/bugs/moddata_2/bug2784_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug28_1
 %%OCCROOT%%/tests/bugs/moddata_2/bug28_2
+%%OCCROOT%%/tests/bugs/moddata_2/bug284
 %%OCCROOT%%/tests/bugs/moddata_2/bug299
+%%OCCROOT%%/tests/bugs/moddata_2/bug3_1
+%%OCCROOT%%/tests/bugs/moddata_2/bug3_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug303_1
 %%OCCROOT%%/tests/bugs/moddata_2/bug303_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug308
@@ -8394,6 +8490,8 @@
 %%OCCROOT%%/tests/bugs/moddata_2/bug360
 %%OCCROOT%%/tests/bugs/moddata_2/bug366
 %%OCCROOT%%/tests/bugs/moddata_2/bug367
+%%OCCROOT%%/tests/bugs/moddata_2/bug37_1
+%%OCCROOT%%/tests/bugs/moddata_2/bug37_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug372
 %%OCCROOT%%/tests/bugs/moddata_2/bug3721_1
 %%OCCROOT%%/tests/bugs/moddata_2/bug3721_2
@@ -8405,13 +8503,9 @@
 %%OCCROOT%%/tests/bugs/moddata_2/bug374_1
 %%OCCROOT%%/tests/bugs/moddata_2/bug374_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug376
-%%OCCROOT%%/tests/bugs/moddata_2/bug37_1
-%%OCCROOT%%/tests/bugs/moddata_2/bug37_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug380_1
 %%OCCROOT%%/tests/bugs/moddata_2/bug380_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug3896
-%%OCCROOT%%/tests/bugs/moddata_2/bug3_1
-%%OCCROOT%%/tests/bugs/moddata_2/bug3_2
 %%OCCROOT%%/tests/bugs/moddata_2/bug4
 %%OCCROOT%%/tests/bugs/moddata_2/bug408
 %%OCCROOT%%/tests/bugs/moddata_2/bug41
*** 2903 LINES SKIPPED ***