[geos-commits] [SCM] GEOS branch master updated. 94331c78858ec962e53d9bb7c0741d59cb38c05d

[git at osgeo.org]

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  94331c78858ec962e53d9bb7c0741d59cb38c05d (commit)
       via  1b74b4cd7a1431a89713458dc1260f295ff3737b (commit)
      from  0d54f3453533d719f8b7bfd818cad80dc7a36b97 (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 94331c78858ec962e53d9bb7c0741d59cb38c05d
Merge: 0d54f34 1b74b4c
Author: mdavis <mtnclimb at gmail.com>
Date:   Thu Feb 14 11:59:49 2019 -0800

    Merge branch 'disable-perf-test2' of mdavis/geos into master


commit 1b74b4cd7a1431a89713458dc1260f295ff3737b
Author: Martin Davis <mtnclimb at gmail.com>
Date:   Thu Feb 14 11:57:10 2019 -0800

    Build perf tests but don't run them by default

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 788fa2f..9138fe3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -15,5 +15,5 @@ add_subdirectory(unit)
 add_subdirectory(xmltester)
 add_subdirectory(bigtest)
 
-# don't run perf tests by default
-#add_subdirectory(perf)
+# perf tests are built but not run by default
+add_subdirectory(perf)
diff --git a/tests/perf/CMakeLists.txt b/tests/perf/CMakeLists.txt
index 034c6eb..4354dee 100644
--- a/tests/perf/CMakeLists.txt
+++ b/tests/perf/CMakeLists.txt
@@ -22,8 +22,7 @@ if(GEOS_ENABLE_TESTS)
 
   target_link_libraries(perf_class_sizes geos)
 
-  add_test(perf_class_sizes
-    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_class_sizes)
+#  add_test(perf_class_sizes ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_class_sizes)
 
   add_subdirectory(operation)
   add_subdirectory(capi)
diff --git a/tests/perf/capi/CMakeLists.txt b/tests/perf/capi/CMakeLists.txt
index 15e5c78..f6d8315 100644
--- a/tests/perf/capi/CMakeLists.txt
+++ b/tests/perf/capi/CMakeLists.txt
@@ -15,4 +15,4 @@ 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)
+#add_test(perf_memleak_mp_prep ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_memleak_mp_prep)
diff --git a/tests/perf/operation/buffer/CMakeLists.txt b/tests/perf/operation/buffer/CMakeLists.txt
index b6fc3e4..da2840a 100644
--- a/tests/perf/operation/buffer/CMakeLists.txt
+++ b/tests/perf/operation/buffer/CMakeLists.txt
@@ -17,5 +17,4 @@ 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)
+#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
index da25f8f..71e9f51 100644
--- a/tests/perf/operation/predicate/CMakeLists.txt
+++ b/tests/perf/operation/predicate/CMakeLists.txt
@@ -17,5 +17,4 @@ 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)
+#add_test(perf_rectangle_intersects ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/perf_rectangle_intersects)

-----------------------------------------------------------------------

Summary of changes:
 tests/CMakeLists.txt                          | 4 ++--
 tests/perf/CMakeLists.txt                     | 3 +--
 tests/perf/capi/CMakeLists.txt                | 2 +-
 tests/perf/operation/buffer/CMakeLists.txt    | 3 +--
 tests/perf/operation/predicate/CMakeLists.txt | 3 +--
 5 files changed, 6 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GEOS