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: 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 +++
 Tests/CMakeCommands/build_command/RunCMake.cmake | 86 ------------------------
 Tests/CMakeCommands/build_command/test.cmake     | 86 ++++++++++++++++++++++++
 Tests/CMakeLists.txt                             |  8 +--
 4 files changed, 97 insertions(+), 93 deletions(-)
 create mode 100644 Tests/CMakeCommands/CMakeLists.txt
 delete mode 100644 Tests/CMakeCommands/build_command/RunCMake.cmake
 create mode 100644 Tests/CMakeCommands/build_command/test.cmake

diff --git a/Tests/CMakeCommands/CMakeLists.txt b/Tests/CMakeCommands/CMakeLists.txt
new file mode 100644
index 0000000..e9e4020
--- /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/RunCMake.cmake
deleted file mode 100644
index 55d9359..0000000
--- a/Tests/CMakeCommands/build_command/RunCMake.cmake
+++ /dev/null
@@ -1,86 +0,0 @@
-if(NOT DEFINED CMake_SOURCE_DIR)
-  message(FATAL_ERROR "CMake_SOURCE_DIR not defined")
-endif()
-
-if(NOT DEFINED dir)
-  message(FATAL_ERROR "dir not defined")
-endif()
-
-if(NOT DEFINED gen)
-  message(FATAL_ERROR "gen not defined")
-endif()
-
-message(STATUS "CTEST_FULL_OUTPUT (Avoid ctest truncation of output)")
-
-# Run cmake:
-#
-function(run_cmake build_dir extra_args expected_result expected_output expected_error)
-  message(STATUS "run_cmake build_dir='${build_dir}' extra_args='${extra_args}'")
-
-  # Ensure build_dir exists:
-  #
-  execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${build_dir})
-
-  # Run cmake:
-  #
-  execute_process(COMMAND ${CMAKE_COMMAND}
-    ${extra_args}
-    -G ${gen} ${CMake_SOURCE_DIR}/Tests/CMakeCommands/build_command
-    RESULT_VARIABLE result
-    OUTPUT_VARIABLE stdout
-    ERROR_VARIABLE stderr
-    WORKING_DIRECTORY ${build_dir}
-    )
-
-  message(STATUS "result='${result}'")
-  message(STATUS "stdout='${stdout}'")
-  message(STATUS "stderr='${stderr}'")
-  message(STATUS "")
-
-  # Verify result and output match expectations:
-  #
-  if("0" STREQUAL "${expected_result}")
-    if(NOT "${result}" STREQUAL "0")
-      message(FATAL_ERROR
-        "error: result='${result}' is non-zero and different than expected_result='${expected_result}'")
-    endif()
-  else()
-    if("${result}" STREQUAL "0")
-      message(FATAL_ERROR
-        "error: result='${result}' is zero and different than expected_result='${expected_result}'")
-    endif()
-  endif()
-
-  foreach(e ${expected_output})
-    if(NOT stdout MATCHES "${e}")
-      message(FATAL_ERROR
-        "error: stdout does not match expected_output item e='${e}'")
-    else()
-      message(STATUS "info: stdout matches '${e}'")
-    endif()
-  endforeach()
-
-  foreach(e ${expected_error})
-    if(NOT stderr MATCHES "${e}")
-      message(FATAL_ERROR
-        "error: stderr does not match expected_error item e='${e}'")
-    else()
-      message(STATUS "info: stderr matches '${e}'")
-    endif()
-  endforeach()
-
-  message(STATUS "result, stdout and stderr match all expectations: test passes")
-  message(STATUS "")
-endfunction()
-
-
-# Expect this case to succeed:
-run_cmake("${dir}/b1" "" 0
-  "Build files have been written to:"
-  "skipping cases 1, 2 and 3 because TEST_ERROR_CONDITIONS is OFF")
-
-
-# Expect this one to fail:
-run_cmake("${dir}/b2" "-DTEST_ERROR_CONDITIONS:BOOL=ON" 1
-  "Configuring incomplete, errors occurred!"
-  "build_command requires at least one argument naming a CMake variable;build_command unknown argument ")
diff --git a/Tests/CMakeCommands/build_command/test.cmake b/Tests/CMakeCommands/build_command/test.cmake
new file mode 100644
index 0000000..55d9359
--- /dev/null
+++ b/Tests/CMakeCommands/build_command/test.cmake
@@ -0,0 +1,86 @@
+if(NOT DEFINED CMake_SOURCE_DIR)
+  message(FATAL_ERROR "CMake_SOURCE_DIR not defined")
+endif()
+
+if(NOT DEFINED dir)
+  message(FATAL_ERROR "dir not defined")
+endif()
+
+if(NOT DEFINED gen)
+  message(FATAL_ERROR "gen not defined")
+endif()
+
+message(STATUS "CTEST_FULL_OUTPUT (Avoid ctest truncation of output)")
+
+# Run cmake:
+#
+function(run_cmake build_dir extra_args expected_result expected_output expected_error)
+  message(STATUS "run_cmake build_dir='${build_dir}' extra_args='${extra_args}'")
+
+  # Ensure build_dir exists:
+  #
+  execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${build_dir})
+
+  # Run cmake:
+  #
+  execute_process(COMMAND ${CMAKE_COMMAND}
+    ${extra_args}
+    -G ${gen} ${CMake_SOURCE_DIR}/Tests/CMakeCommands/build_command
+    RESULT_VARIABLE result
+    OUTPUT_VARIABLE stdout
+    ERROR_VARIABLE stderr
+    WORKING_DIRECTORY ${build_dir}
+    )
+
+  message(STATUS "result='${result}'")
+  message(STATUS "stdout='${stdout}'")
+  message(STATUS "stderr='${stderr}'")
+  message(STATUS "")
+
+  # Verify result and output match expectations:
+  #
+  if("0" STREQUAL "${expected_result}")
+    if(NOT "${result}" STREQUAL "0")
+      message(FATAL_ERROR
+        "error: result='${result}' is non-zero and different than expected_result='${expected_result}'")
+    endif()
+  else()
+    if("${result}" STREQUAL "0")
+      message(FATAL_ERROR
+        "error: result='${result}' is zero and different than expected_result='${expected_result}'")
+    endif()
+  endif()
+
+  foreach(e ${expected_output})
+    if(NOT stdout MATCHES "${e}")
+      message(FATAL_ERROR
+        "error: stdout does not match expected_output item e='${e}'")
+    else()
+      message(STATUS "info: stdout matches '${e}'")
+    endif()
+  endforeach()
+
+  foreach(e ${expected_error})
+    if(NOT stderr MATCHES "${e}")
+      message(FATAL_ERROR
+        "error: stderr does not match expected_error item e='${e}'")
+    else()
+      message(STATUS "info: stderr matches '${e}'")
+    endif()
+  endforeach()
+
+  message(STATUS "result, stdout and stderr match all expectations: test passes")
+  message(STATUS "")
+endfunction()
+
+
+# Expect this case to succeed:
+run_cmake("${dir}/b1" "" 0
+  "Build files have been written to:"
+  "skipping cases 1, 2 and 3 because TEST_ERROR_CONDITIONS is OFF")
+
+
+# Expect this one to fail:
+run_cmake("${dir}/b2" "-DTEST_ERROR_CONDITIONS:BOOL=ON" 1
+  "Configuring incomplete, errors occurred!"
+  "build_command requires at least one argument naming a CMake variable;build_command unknown argument ")
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9c97828..3a1453b 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(
-- 
cgit v0.12