From 5e1a5c44da395f8b2c121789e81f4a360a4088bc Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 28 Feb 2012 11:34:10 -0500
Subject: [PATCH] Add infrastructure for CMakeCommands tests

Generalize the build_command test framework as a macro to add the
test.  Process the CMakeCommands subdirectory explicitly.
---
 Tests/CMakeCommands/CMakeLists.txt                     | 10 ++++++++++
 .../build_command/{RunCMake.cmake => test.cmake}       |  0
 Tests/CMakeLists.txt                                   |  8 +-------
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 Tests/CMakeCommands/CMakeLists.txt
 rename Tests/CMakeCommands/build_command/{RunCMake.cmake => test.cmake} (100%)

diff --git a/Tests/CMakeCommands/CMakeLists.txt b/Tests/CMakeCommands/CMakeLists.txt
new file mode 100644
index 000000000..e9e4020e1
--- /dev/null
+++ b/Tests/CMakeCommands/CMakeLists.txt
@@ -0,0 +1,10 @@
+macro(add_CMakeCommands_test test)
+  add_test(CMakeCommands.${test} ${CMAKE_CMAKE_COMMAND}
+    -DCMake_SOURCE_DIR=${CMake_SOURCE_DIR} # TODO: Remove
+    -Ddir=${CMAKE_CURRENT_BINARY_DIR}/${test}
+    -Dgen=${CMAKE_TEST_GENERATOR}
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/test.cmake"
+    )
+endmacro()
+
+add_CMakeCommands_test(build_command)
diff --git a/Tests/CMakeCommands/build_command/RunCMake.cmake b/Tests/CMakeCommands/build_command/test.cmake
similarity index 100%
rename from Tests/CMakeCommands/build_command/RunCMake.cmake
rename to Tests/CMakeCommands/build_command/test.cmake
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9c9782822..3a1453b5d 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -48,6 +48,7 @@ IF(BUILD_TESTING)
 
   ADD_SUBDIRECTORY(CMakeLib)
   ADD_SUBDIRECTORY(CMakeOnly)
+  ADD_SUBDIRECTORY(CMakeCommands)
 
   ADD_SUBDIRECTORY(FindPackageModeMakefileTest)
 
@@ -1695,13 +1696,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
   add_config_tests(Release)
   add_config_tests(RelWithDebInfo)
 
-  add_test(CMakeCommands.build_command ${CMAKE_CMAKE_COMMAND}
-    -DCMake_SOURCE_DIR=${CMake_SOURCE_DIR}
-    -Ddir=${CMake_BINARY_DIR}/Tests/CMakeCommands/build_command
-    -Dgen=${CMAKE_TEST_GENERATOR}
-    -P "${CMake_SOURCE_DIR}/Tests/CMakeCommands/build_command/RunCMake.cmake"
-  )
-
   ADD_TEST_MACRO(CMakeCommands.target_link_libraries target_link_libraries)
 
   CONFIGURE_FILE(