libgeos · dbaston · Aug 15, 2024 · Aug 15, 2024 · Aug 15, 2024 · Aug 15, 2024
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -9,7 +9,9 @@
 # by the Free Software Foundation.
 # See the COPYING file for more information.
 ################################################################################
+
 file(GLOB_RECURSE _sources ${CMAKE_CURRENT_LIST_DIR}/*.cpp CONFIGURE_DEPEND)
+set_source_files_properties(${_sources} PROPERTIES COMPILE_FLAGS -O1)
 add_executable(test_geos_unit ${_sources})
 unset(_sources)
 
@@ -20,6 +22,14 @@ target_include_directories(test_geos_unit
   PRIVATE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>)
 
+# Precompile TUT when using gcc
+# Some clang and MSVC CI configurations complain about the combination of
+# PCH and -O1
+if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
+    target_precompile_headers(test_geos_unit PRIVATE
+        "$<$<CXX_COMPILER_ID:GNU>:${CMAKE_CURRENT_LIST_DIR}/tut/tut.hpp>")
+endif()
+
 file(GLOB_RECURSE _testfiles ${CMAKE_CURRENT_LIST_DIR}/**/*Test.cpp CONFIGURE_DEPEND)
 foreach(_testfile ${_testfiles})
     string(REPLACE ${CMAKE_CURRENT_LIST_DIR}/ "" _testname ${_testfile})

diff --git a/tests/unit/algorithm/AngleTest.cpp b/tests/unit/algorithm/AngleTest.cpp
@@ -7,9 +7,7 @@
 #include <geos/geom/Coordinate.h>
 #include <geos/algorithm/Angle.h>
 // std
-#include <sstream>
 #include <string>
-#include <memory>
 
 namespace tut {
 //

diff --git a/tests/unit/algorithm/AreaTest.cpp b/tests/unit/algorithm/AreaTest.cpp
@@ -13,7 +13,6 @@
 #include <geos/geom/PrecisionModel.h>
 #include <geos/io/WKTReader.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp b/tests/unit/algorithm/CGAlgorithms/OrientationIsCCWTest.cpp
@@ -15,7 +15,6 @@
 // std
 #include <string>
 #include <memory>
-#include <cassert>
 #include <sstream>
 
 using namespace geos::algorithm;

diff --git a/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp b/tests/unit/algorithm/CGAlgorithms/signedAreaTest.cpp
@@ -15,7 +15,6 @@
 #include <string>
 #include <memory>
 #include <cassert>
-#include <sstream>
 
 using namespace geos::algorithm;
 

diff --git a/tests/unit/algorithm/CentroidTest.cpp b/tests/unit/algorithm/CentroidTest.cpp
@@ -12,7 +12,6 @@
 #include <geos/geom/PrecisionModel.h>
 #include <geos/io/WKTReader.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/ConvexHullTest.cpp b/tests/unit/algorithm/ConvexHullTest.cpp
@@ -17,7 +17,6 @@
 // std
 #include <sstream>
 #include <memory>
-#include <cassert>
 
 namespace geos {
 namespace geom {

diff --git a/tests/unit/algorithm/InteriorPointAreaTest.cpp b/tests/unit/algorithm/InteriorPointAreaTest.cpp
@@ -23,7 +23,6 @@
 #include <geos/io/WKTReader.h>
 #include <geos/geom/Geometry.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/IntersectionTest.cpp b/tests/unit/algorithm/IntersectionTest.cpp
@@ -23,8 +23,6 @@
 #include <geos/io/WKTReader.h>
 #include <geos/geom/Geometry.h>
 // std
-#include <sstream>
-#include <string>
 #include <memory>
 
 namespace tut {

diff --git a/tests/unit/algorithm/LengthTest.cpp b/tests/unit/algorithm/LengthTest.cpp
@@ -13,7 +13,6 @@
 #include <geos/geom/PrecisionModel.h>
 #include <geos/io/WKTReader.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/LocatePointInRingTest.cpp b/tests/unit/algorithm/LocatePointInRingTest.cpp
@@ -15,7 +15,6 @@
 #include <geos/geom/LineString.h>
 #include <geos/geom/Coordinate.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/MinimumAreaRectangleTest.cpp b/tests/unit/algorithm/MinimumAreaRectangleTest.cpp
@@ -8,7 +8,6 @@
 #include <geos/geom/Geometry.h>
 #include <utility.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/MinimumBoundingCircleTest.cpp b/tests/unit/algorithm/MinimumBoundingCircleTest.cpp
@@ -25,7 +25,6 @@
 #include <geos/io/WKTReader.h>
 
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/MinimumDiameterTest.cpp b/tests/unit/algorithm/MinimumDiameterTest.cpp
@@ -23,7 +23,6 @@
 #include <geos/io/WKTWriter.h>
 #include <geos/geom/Geometry.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/OrientationIndexFailureTest.cpp b/tests/unit/algorithm/OrientationIndexFailureTest.cpp
@@ -7,9 +7,6 @@
 #include <geos/geom/Coordinate.h>
 #include <geos/algorithm/Orientation.h>
 // std
-#include <sstream>
-#include <string>
-#include <memory>
 
 using namespace geos::geom;
 using namespace geos::algorithm;

diff --git a/tests/unit/algorithm/PointLocationTest.cpp b/tests/unit/algorithm/PointLocationTest.cpp
@@ -10,7 +10,6 @@
 #include <geos/algorithm/PointLocation.h>
 
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/PointLocatorTest.cpp b/tests/unit/algorithm/PointLocatorTest.cpp
@@ -12,7 +12,6 @@
 #include <geos/geom/Geometry.h> // required for use in unique_ptr
 #include <geos/geom/Coordinate.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/PolygonNodeTopologyTest.cpp b/tests/unit/algorithm/PolygonNodeTopologyTest.cpp
@@ -9,7 +9,6 @@
 #include <geos/algorithm/PolygonNodeTopology.h>
 
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/RobustLineIntersectionTest.cpp b/tests/unit/algorithm/RobustLineIntersectionTest.cpp
@@ -11,7 +11,6 @@
 #include <geos/geom/LineString.h>
 #include <geos/geom/Coordinate.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/RobustLineIntersectorZTest.cpp b/tests/unit/algorithm/RobustLineIntersectorZTest.cpp
@@ -10,9 +10,6 @@
 #include <geos/geom/Coordinate.h>
 #include <geos/geom/LineSegment.h>
 // std
-#include <sstream>
-#include <string>
-#include <memory>
 #include <utility>
 
 

diff --git a/tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp b/tests/unit/algorithm/construct/LargestEmptyCircleTest.cpp
@@ -11,7 +11,6 @@
 #include <geos/io/WKTReader.h>
 #include <geos/constants.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp b/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp
@@ -15,7 +15,6 @@
 #include <geos/io/WKTWriter.h>
 #include <geos/util.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp b/tests/unit/algorithm/distance/DiscreteFrechetDistanceTest.cpp
@@ -14,7 +14,6 @@
 #include <geos/util.h>
 // std
 #include <cmath>
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp b/tests/unit/algorithm/distance/DiscreteHausdorffDistanceTest.cpp
@@ -14,7 +14,6 @@
 #include <geos/geom/Coordinate.h>
 // std
 #include <cmath>
-#include <sstream>
 #include <string>
 #include <memory>
 #include <cfenv>

diff --git a/tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp b/tests/unit/algorithm/hull/ConcaveHullOfPolygonsTest.cpp
@@ -10,7 +10,6 @@
 #include <geos/constants.h>
 #include <utility.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/hull/ConcaveHullTest.cpp b/tests/unit/algorithm/hull/ConcaveHullTest.cpp
@@ -10,7 +10,6 @@
 #include <geos/constants.h>
 #include <utility.h>
 // std
-#include <sstream>
 #include <string>
 #include <memory>
 

diff --git a/tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp b/tests/unit/algorithm/locate/IndexedPointInAreaLocatorTest.cpp
@@ -5,8 +5,6 @@
 #include <geos/algorithm/locate/IndexedPointInAreaLocator.h>
 
 // std
-#include <sstream>
-#include <string>
 #include <memory>
 
 using geos::geom::CoordinateXY;

diff --git a/tests/unit/capi/GEOSBufferTest.cpp b/tests/unit/capi/GEOSBufferTest.cpp
@@ -5,10 +5,6 @@
 // geos
 #include <geos_c.h>
 // std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSBuildAreaTest.cpp b/tests/unit/capi/GEOSBuildAreaTest.cpp
@@ -4,10 +4,6 @@
 // geos
 #include <geos_c.h>
 // std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSCAPIDefinesTest.cpp b/tests/unit/capi/GEOSCAPIDefinesTest.cpp
@@ -5,10 +5,6 @@
 // geos
 #include <geos_c.h>
 // std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
 #define QUOTE(x) #x
 #define EXPAND_AND_QUOTE(y) QUOTE(y)

diff --git a/tests/unit/capi/GEOSClipByRectTest.cpp b/tests/unit/capi/GEOSClipByRectTest.cpp
@@ -5,10 +5,8 @@
 // geos
 #include <geos_c.h>
 // std
-#include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include <memory>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp b/tests/unit/capi/GEOSConcaveHullOfPolygonsTest.cpp
@@ -5,9 +5,6 @@
 // geos
 #include <geos_c.h>
 // std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSConcaveHullTest.cpp b/tests/unit/capi/GEOSConcaveHullTest.cpp
@@ -5,9 +5,6 @@
 // geos
 #include <geos_c.h>
 // std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp b/tests/unit/capi/GEOSConstrainedDelaunayTriangulationTest.cpp
@@ -5,10 +5,6 @@
 // geos
 #include <geos_c.h>
 // std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSContainsTest.cpp b/tests/unit/capi/GEOSContainsTest.cpp
@@ -8,9 +8,6 @@
 #include <geos/geom/PrecisionModel.h>
 #include <geos/geom/GeometryFactory.h>
 // std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSConvexHullTest.cpp b/tests/unit/capi/GEOSConvexHullTest.cpp
@@ -5,9 +5,6 @@
 // geos
 #include <geos_c.h>
 // std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSCoordSeqTest.cpp b/tests/unit/capi/GEOSCoordSeqTest.cpp
@@ -5,10 +5,9 @@
 // geos
 #include <geos_c.h>
 // std
-#include <cstdarg>
+#include <algorithm>
 #include <cstdio>
 #include <cstdlib>
-#include <memory>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSCoverageIsValidTest.cpp b/tests/unit/capi/GEOSCoverageIsValidTest.cpp
@@ -4,11 +4,6 @@
 #include <tut/tut.hpp>
 // geos
 #include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSCoverageSimplifyTest.cpp b/tests/unit/capi/GEOSCoverageSimplifyTest.cpp
@@ -4,11 +4,6 @@
 #include <tut/tut.hpp>
 // geos
 #include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSCoverageUnionTest.cpp b/tests/unit/capi/GEOSCoverageUnionTest.cpp
@@ -4,11 +4,6 @@
 #include <tut/tut.hpp>
 // geos
 #include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
 #include "capi_test_utils.h"
 

diff --git a/tests/unit/capi/GEOSDelaunayTriangulationTest.cpp b/tests/unit/capi/GEOSDelaunayTriangulationTest.cpp
@@ -4,11 +4,6 @@
 #include <tut/tut.hpp>
 // geos
 #include <geos_c.h>
-// std
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <memory>
 
 #include "capi_test_utils.h"