[geos-commits] [SCM] geos branch master updated. c5892faf4bdc3777420a638ed265d1e521d074b7
git at osgeo.org
git at osgeo.org
Thu Sep 7 11:52:22 PDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "geos".
The branch, master has been updated
via c5892faf4bdc3777420a638ed265d1e521d074b7 (commit)
via 6b236e95faf8a3f52d2ee4158d1e7f57829fe42f (commit)
from f1c2215d560473fec89c0b047f299e9028be6533 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c5892faf4bdc3777420a638ed265d1e521d074b7
Author: Mateusz Loskot <mateusz at loskot.net>
Date: Thu Sep 7 20:51:55 2017 +0200
[CMake] Add tests/perf targets to build configuration
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b772b01..fc8eee6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@
#
# This is free software; you can redistribute and/or modify it under
# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation.
+# by the Free Software Foundation.
# See the COPYING file for more information.
#
#################################################################################
@@ -14,3 +14,4 @@
add_subdirectory(unit)
add_subdirectory(xmltester)
add_subdirectory(bigtest)
+add_subdirectory(perf)
diff --git a/tests/perf/CMakeLists.txt b/tests/perf/CMakeLists.txt
new file mode 100644
index 0000000..034c6eb
--- /dev/null
+++ b/tests/perf/CMakeLists.txt
@@ -0,0 +1,34 @@
+#################################################################################
+#
+# CMake configuration for GEOS perf tests
+#
+# Copyright (C) 2017 Mateusz Loskot <mateusz at loskot.net>
+#
+# This is free software; you can redistribute and/or modify it under
+# the terms of the GNU Lesser General Public Licence as published
+# by the Free Software Foundation.
+# See the COPYING file for more information.
+#
+#################################################################################
+
+set(STATUS_MESSAGE "Enable GEOS performance tests build")
+set(STATUS_RESULT "OFF")
+
+if(GEOS_ENABLE_TESTS)
+
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+ add_executable(perf_class_sizes ClassSizes.cpp)
+
+ target_link_libraries(perf_class_sizes geos)
+
+ add_test(perf_class_sizes
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_class_sizes)
+
+ add_subdirectory(operation)
+ add_subdirectory(capi)
+
+ set(STATUS_RESULT "ON")
+endif()
+
+message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")
diff --git a/tests/perf/capi/CMakeLists.txt b/tests/perf/capi/CMakeLists.txt
new file mode 100644
index 0000000..15e5c78
--- /dev/null
+++ b/tests/perf/capi/CMakeLists.txt
@@ -0,0 +1,18 @@
+#################################################################################
+#
+# CMake configuration for GEOS perf/capi tests
+#
+# Copyright (C) 2017 Mateusz Loskot <mateusz at loskot.net>
+#
+# This is free software; you can redistribute and/or modify it under
+# the terms of the GNU Lesser General Public Licence as published
+# by the Free Software Foundation.
+# See the COPYING file for more information.
+#
+#################################################################################
+
+add_executable(perf_memleak_mp_prep memleak_mp_prep.c)
+
+target_link_libraries(perf_memleak_mp_prep geos_c)
+
+add_test(perf_memleak_mp_prep ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_memleak_mp_prep)
diff --git a/tests/perf/operation/CMakeLists.txt b/tests/perf/operation/CMakeLists.txt
new file mode 100644
index 0000000..9a23175
--- /dev/null
+++ b/tests/perf/operation/CMakeLists.txt
@@ -0,0 +1,15 @@
+#################################################################################
+#
+# CMake configuration for GEOS perf/operation tests
+#
+# Copyright (C) 2017 Mateusz Loskot <mateusz at loskot.net>
+#
+# This is free software; you can redistribute and/or modify it under
+# the terms of the GNU Lesser General Public Licence as published
+# by the Free Software Foundation.
+# See the COPYING file for more information.
+#
+#################################################################################
+
+add_subdirectory(buffer)
+add_subdirectory(predicate)
diff --git a/tests/perf/operation/buffer/CMakeLists.txt b/tests/perf/operation/buffer/CMakeLists.txt
new file mode 100644
index 0000000..b6fc3e4
--- /dev/null
+++ b/tests/perf/operation/buffer/CMakeLists.txt
@@ -0,0 +1,21 @@
+#################################################################################
+#
+# CMake configuration for GEOS perf/operation/buffer tests
+#
+# Copyright (C) 2017 Mateusz Loskot <mateusz at loskot.net>
+#
+# This is free software; you can redistribute and/or modify it under
+# the terms of the GNU Lesser General Public Licence as published
+# by the Free Software Foundation.
+# See the COPYING file for more information.
+#
+#################################################################################
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/io/markup)
+
+add_executable(perf_iterated_buffer IteratedBufferStressTest.cpp)
+
+target_link_libraries(perf_iterated_buffer geos)
+
+add_test(perf_iterated_buffer
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_iterated_buffer)
diff --git a/tests/perf/operation/predicate/CMakeLists.txt b/tests/perf/operation/predicate/CMakeLists.txt
new file mode 100644
index 0000000..da25f8f
--- /dev/null
+++ b/tests/perf/operation/predicate/CMakeLists.txt
@@ -0,0 +1,21 @@
+#################################################################################
+#
+# CMake configuration for GEOS perf/operation/predicate tests
+#
+# Copyright (C) 2017 Mateusz Loskot <mateusz at loskot.net>
+#
+# This is free software; you can redistribute and/or modify it under
+# the terms of the GNU Lesser General Public Licence as published
+# by the Free Software Foundation.
+# See the COPYING file for more information.
+#
+#################################################################################
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/io/markup)
+
+add_executable(perf_rectangle_intersects RectangleIntersectsPerfTest.cpp)
+
+target_link_libraries(perf_rectangle_intersects geos)
+
+add_test(perf_rectangle_intersects
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_rectangle_intersects)
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 4d26190..25047f1 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -6,20 +6,20 @@
#
# This is free software; you can redistribute and/or modify it under
# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation.
+# by the Free Software Foundation.
# See the COPYING file for more information.
#
#################################################################################
-set(STATUS_MESSAGE "Enable GEOSuUnit Tests build")
+set(STATUS_MESSAGE "Enable GEOS unit tests build")
set(STATUS_RESULT "OFF")
if(GEOS_ENABLE_TESTS)
include_directories(${CMAKE_SOURCE_DIR}/capi)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
+
file(GLOB_RECURSE geos_unit_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
-
+
add_executable(geos_unit ${geos_unit_SOURCES})
if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
target_link_libraries(geos_unit GEOS)
@@ -37,4 +37,4 @@ message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")
#################################################################################
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
-GenerateSourceGroups(tests/unit)
\ No newline at end of file
+GenerateSourceGroups(tests/unit)
diff --git a/tests/xmltester/CMakeLists.txt b/tests/xmltester/CMakeLists.txt
index 3ee3eea..a300dce 100644
--- a/tests/xmltester/CMakeLists.txt
+++ b/tests/xmltester/CMakeLists.txt
@@ -6,12 +6,12 @@
#
# This is free software; you can redistribute and/or modify it under
# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation.
+# by the Free Software Foundation.
# See the COPYING file for more information.
#
#################################################################################
-set(STATUS_MESSAGE "Enable GEOS XML Tester build")
+set(STATUS_MESSAGE "Enable GEOS XML tests build")
set(STATUS_RESULT "OFF")
if(GEOS_ENABLE_TESTS)
commit 6b236e95faf8a3f52d2ee4158d1e7f57829fe42f
Author: Mateusz Loskot <mateusz at loskot.net>
Date: Thu Sep 7 20:48:42 2017 +0200
Add GEOS_DLL to opeartor<< functions in Profiler
diff --git a/include/geos/profiler.h b/include/geos/profiler.h
index 53595d5..377703e 100644
--- a/include/geos/profiler.h
+++ b/include/geos/profiler.h
@@ -177,10 +177,10 @@ public:
/** \brief Return a string representing the Profile */
-std::ostream& operator<< (std::ostream& os, const Profile&);
+GEOS_DLL std::ostream& operator<< (std::ostream& os, const Profile&);
/** \brief Return a string representing the Profiler */
-std::ostream& operator<< (std::ostream& os, const Profiler&);
+GEOS_DLL std::ostream& operator<< (std::ostream& os, const Profiler&);
} // namespace geos::util
} // namespace geos
-----------------------------------------------------------------------
Summary of changes:
include/geos/profiler.h | 4 +--
tests/CMakeLists.txt | 3 ++-
tests/perf/CMakeLists.txt | 34 +++++++++++++++++++++++++
tests/perf/capi/CMakeLists.txt | 18 +++++++++++++
tests/perf/operation/CMakeLists.txt | 15 +++++++++++
tests/perf/operation/buffer/CMakeLists.txt | 21 +++++++++++++++
tests/perf/operation/predicate/CMakeLists.txt | 21 +++++++++++++++
tests/unit/CMakeLists.txt | 10 ++++----
tests/xmltester/CMakeLists.txt | 4 +--
9 files changed, 120 insertions(+), 10 deletions(-)
create mode 100644 tests/perf/CMakeLists.txt
create mode 100644 tests/perf/capi/CMakeLists.txt
create mode 100644 tests/perf/operation/CMakeLists.txt
create mode 100644 tests/perf/operation/buffer/CMakeLists.txt
create mode 100644 tests/perf/operation/predicate/CMakeLists.txt
hooks/post-receive
--
geos
More information about the geos-commits
mailing list