[geos-commits] [SCM] geos branch master updated. e43016dd7397711e5bd64cdba92f2b6f671c4fbc

git at osgeo.org git at osgeo.org
Thu Sep 7 12:34:58 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  e43016dd7397711e5bd64cdba92f2b6f671c4fbc (commit)
      from  c5892faf4bdc3777420a638ed265d1e521d074b7 (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 e43016dd7397711e5bd64cdba92f2b6f671c4fbc
Author: Mateusz Loskot <mateusz at loskot.net>
Date:   Thu Sep 7 21:34:51 2017 +0200

    [CMake] Rename tests targets using test_ prefix

diff --git a/tests/bigtest/CMakeLists.txt b/tests/bigtest/CMakeLists.txt
index 9c23383..9734b38 100644
--- a/tests/bigtest/CMakeLists.txt
+++ b/tests/bigtest/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.
 #
 #################################################################################
@@ -19,26 +19,26 @@ if(GEOS_ENABLE_TESTS)
   include_directories(${CMAKE_CURRENT_SOURCE_DIR})
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/io/markup)
 
-  add_executable(bug234 bug234.cpp)
+  add_executable(test_bug234 bug234.cpp)
 
-  if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK) 
-    target_link_libraries(bug234 GEOS) 
-  else() 
-    target_link_libraries(bug234 geos) 
-  endif() 
+  if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
+    target_link_libraries(test_bug234 GEOS)
+  else()
+    target_link_libraries(test_bug234 geos)
+  endif()
 
-  add_executable(TestSweepLineSpeed
+  add_executable(test_sweep_line_speed
 	TestSweepLineSpeed.cpp
 	GeometryTestFactory.cpp
 	bigtest.h)
   if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
-    target_link_libraries(TestSweepLineSpeed GEOS)
+    target_link_libraries(test_sweep_line_speed GEOS)
   else()
-    target_link_libraries(TestSweepLineSpeed geos)
+    target_link_libraries(test_sweep_line_speed geos)
   endif()
 
-  add_test(bug234 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bug234)
-  add_test(TestSweepLineSpeed ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/TestSweepLineSpeed)
+  add_test(test_bug234 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_bug234)
+  add_test(test_sweep_line_speed ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_sweep_line_speed)
 
   set(STATUS_RESULT "ON")
 endif()
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 25047f1..8bfc898 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -20,14 +20,15 @@ if(GEOS_ENABLE_TESTS)
 
   file(GLOB_RECURSE geos_unit_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 
-  add_executable(geos_unit ${geos_unit_SOURCES})
+  add_executable(test_geos_unit ${geos_unit_SOURCES})
+
   if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
-    target_link_libraries(geos_unit GEOS)
+    target_link_libraries(test_geos_unit GEOS)
  	else()
-    target_link_libraries(geos_unit geos geos_c)
+    target_link_libraries(test_geos_unit geos geos_c)
  	endif()
 
-  add_test(geos_unit ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/geos_unit)
+  add_test(test_geos_unit ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_geos_unit)
 
   set(STATUS_RESULT "ON")
 endif()
diff --git a/tests/xmltester/CMakeLists.txt b/tests/xmltester/CMakeLists.txt
index a300dce..1eebe10 100644
--- a/tests/xmltester/CMakeLists.txt
+++ b/tests/xmltester/CMakeLists.txt
@@ -30,18 +30,20 @@ if(GEOS_ENABLE_TESTS)
     BufferResultMatcher.cpp
     SingleSidedBufferResultMatcher.cpp)
 
-  add_executable(simplewkttester ${simplewkttester_SOURCES})
+  add_executable(test_simplewkttester ${simplewkttester_SOURCES})
+
   if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
-    target_link_libraries(simplewkttester GEOS)
+    target_link_libraries(test_simplewkttester GEOS)
  	else()
-    target_link_libraries(simplewkttester geos)
+    target_link_libraries(test_simplewkttester geos)
  	endif()
 
-  add_executable(xmltester ${xmltester_SOURCES})
+  add_executable(test_xmltester ${xmltester_SOURCES})
+
   if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
-    target_link_libraries(xmltester GEOS)
+    target_link_libraries(test_xmltester GEOS)
  	else()
-    target_link_libraries(xmltester geos)
+    target_link_libraries(test_xmltester geos)
   endif()
 
   set(XMLTESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tests)
@@ -105,7 +107,7 @@ if(GEOS_ENABLE_TESTS)
     ${XMLTESTS_DIR}/safe/16595.xml
     ${XMLTESTS_DIR}/safe/16596.xml)
 
-  add_test(xmltester ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xmltester ${SAVE_XMLTESTS})
+  add_test(test_xmltester ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_xmltester ${SAVE_XMLTESTS})
 
   set(STATUS_RESULT "ON")
 endif()

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

Summary of changes:
 tests/bigtest/CMakeLists.txt   |   24 ++++++++++++------------
 tests/unit/CMakeLists.txt      |    9 +++++----
 tests/xmltester/CMakeLists.txt |   16 +++++++++-------
 3 files changed, 26 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
geos


More information about the geos-commits mailing list