[geos-commits] r2900 - in trunk/tests: unit xmltester

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-01-30 22:06:36 -0500 (Sat, 30 Jan 2010)
New Revision: 2900

Modified:
   trunk/tests/unit/CMakeLists.txt
   trunk/tests/xmltester/CMakeLists.txt
Log:
Added XMLTester to CTest configuration - work in progress (#317)

Modified: trunk/tests/unit/CMakeLists.txt
===================================================================
--- trunk/tests/unit/CMakeLists.txt	2010-01-31 03:05:15 UTC (rev 2899)
+++ trunk/tests/unit/CMakeLists.txt	2010-01-31 03:06:36 UTC (rev 2900)
@@ -12,7 +12,7 @@
 #
 #################################################################################
 
-set(STATUS_MESSAGE "Enable GEOS tests build and run")
+set(STATUS_MESSAGE "Enable GEOS Unit Tests build")
 set(STATUS_RESULT "OFF")
 
 if(GEOS_ENABLE_TESTS)
@@ -30,5 +30,4 @@
   set(STATUS_RESULT "ON")
 endif()
 
-message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")
-
+message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")
\ No newline at end of file

Modified: trunk/tests/xmltester/CMakeLists.txt
===================================================================
--- trunk/tests/xmltester/CMakeLists.txt	2010-01-31 03:05:15 UTC (rev 2899)
+++ trunk/tests/xmltester/CMakeLists.txt	2010-01-31 03:06:36 UTC (rev 2900)
@@ -12,22 +12,36 @@
 #
 #################################################################################
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tinyxml)
+set(STATUS_MESSAGE "Enable GEOS XML Tester build")
+set(STATUS_RESULT "OFF")
 
-set(simplewkttester_SOURCES SimpleWKTTester.cpp)
+if(GEOS_ENABLE_TESTS)
 
-set(xmltester_SOURCES
-  XMLTester.cpp
-  tinyxml/tinyxml.cpp
-  tinyxml/tinystr.cpp
-  tinyxml/tinyxmlerror.cpp
-  tinyxml/tinyxmlparser.cpp
-  BufferResultMatcher.cpp
-  SingleSidedBufferResultMatcher.cpp)
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tinyxml)
 
-add_executable(simplewkttester ${simplewkttester_SOURCES})
-target_link_libraries(simplewkttester geos)
+  set(simplewkttester_SOURCES SimpleWKTTester.cpp)
 
-add_executable(xmltester ${xmltester_SOURCES})
-target_link_libraries(xmltester geos)
+  set(xmltester_SOURCES
+    XMLTester.cpp
+    tinyxml/tinyxml.cpp
+    tinyxml/tinystr.cpp
+    tinyxml/tinyxmlerror.cpp
+    tinyxml/tinyxmlparser.cpp
+    BufferResultMatcher.cpp
+    SingleSidedBufferResultMatcher.cpp)
+
+  add_executable(simplewkttester ${simplewkttester_SOURCES})
+  target_link_libraries(simplewkttester geos)
+
+  add_executable(xmltester ${xmltester_SOURCES})
+  target_link_libraries(xmltester geos)
+
+  add_test(xmltester 
+    ${CMAKE_CURRENT_BINARY_DIR}/xmltester
+    ${CMAKE_CURRENT_SOURCE_DIR}/tests/TestBigNastyBuffer.xml)
+
+  set(STATUS_RESULT "ON")
+endif()
+
+message(STATUS "${STATUS_MESSAGE} - ${STATUS_RESULT}")
\ No newline at end of file