[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.171 1.172

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv29259/Tests

Modified Files:
	CMakeLists.txt 
Log Message:
Teach ADD_TEST_MACRO about test namespaces

We teach ADD_TEST_MACRO to transform names of the form "Namespace.Name"
to the directory "Namespace/Name" and the project name "Name".  This
will allow new tests to be better organized.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.171
retrieving revision 1.172
diff -C 2 -d -r1.171 -r1.172
*** CMakeLists.txt	17 Dec 2009 17:51:40 -0000	1.171
--- CMakeLists.txt	17 Dec 2009 20:14:14 -0000	1.172
***************
*** 2,15 ****
  # directory and project
  MACRO(ADD_TEST_MACRO NAME COMMAND)
    ADD_TEST(${NAME} ${CMAKE_CTEST_COMMAND}
      --build-and-test
!     "${CMake_SOURCE_DIR}/Tests/${NAME}"
!     "${CMake_BINARY_DIR}/Tests/${NAME}"
      --build-two-config
      --build-generator ${CMAKE_TEST_GENERATOR}
      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
!     --build-project ${NAME}
      --test-command ${COMMAND})
!   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${NAME}")
  ENDMACRO(ADD_TEST_MACRO)
  
--- 2,17 ----
  # directory and project
  MACRO(ADD_TEST_MACRO NAME COMMAND)
+   STRING(REPLACE "." "/" dir "${NAME}")
+   STRING(REGEX REPLACE "[^.]*\\." "" proj "${NAME}")
    ADD_TEST(${NAME} ${CMAKE_CTEST_COMMAND}
      --build-and-test
!     "${CMake_SOURCE_DIR}/Tests/${dir}"
!     "${CMake_BINARY_DIR}/Tests/${dir}"
      --build-two-config
      --build-generator ${CMAKE_TEST_GENERATOR}
      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
!     --build-project ${proj}
      --test-command ${COMMAND})
!   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${dir}")
  ENDMACRO(ADD_TEST_MACRO)