From 5e102d5e014bb21c66511226b9c60e54863f0636 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 11 Jun 2010 14:03:53 -0400
Subject: [PATCH] Enable BootstrapTest on MSYS

The bootstrap script works under MSYS, so test it.  Use a launcher batch
file since 'ctest --build-and-test' is a Windows program and will not
honor the shebang line in the script.
---
 Tests/CMakeLists.txt   | 18 +++++++++++++-----
 Tests/bootstrap.bat.in |  2 ++
 2 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 Tests/bootstrap.bat.in

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1b8f4f383..3ffe70bae 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1572,16 +1572,24 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     # If there is CMakeLists.txt in the binary tree, assume in-source build
     SET(CMAKE_SKIP_BOOTSTRAP_TEST 1)
   ENDIF(EXISTS "${CMAKE_BINARY_DIR}/CMakeLists.txt")
-  IF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)
-
-
+  SET(bootstrap "")
+  IF(CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)
+    IF(UNIX)
+      SET(bootstrap ${CMake_SOURCE_DIR}/bootstrap)
+    ELSEIF(MSYS)
+      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bootstrap.bat.in
+                     ${CMAKE_CURRENT_BINARY_DIR}/bootstrap.bat @ONLY)
+      SET(bootstrap ${CMAKE_CURRENT_BINARY_DIR}/bootstrap.bat)
+    ENDIF()
+  ENDIF()
+  IF(bootstrap)
     ADD_TEST(BootstrapTest ${CMAKE_CTEST_COMMAND}
       --build-and-test
       ${CMake_SOURCE_DIR}
       ${CMake_BINARY_DIR}/Tests/BootstrapTest
       --build-nocmake
       --build-noclean
-      --build-makeprogram ${CMake_SOURCE_DIR}/bootstrap
+      --build-makeprogram ${bootstrap}
       --build-generator "${CMAKE_TEST_GENERATOR}"
       --test-command 
       ${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake)
@@ -1595,7 +1603,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
       SET_TESTS_PROPERTIES ( BootstrapTest
         PROPERTIES TIMEOUT 5400)
     ENDIF ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
-  ENDIF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)
+  ENDIF()
 
   # fortran does not work for IDE builds because
   # CMAKE_STANDARD_LIBRARIES needs to be per language
diff --git a/Tests/bootstrap.bat.in b/Tests/bootstrap.bat.in
new file mode 100644
index 000000000..aeb24b1ca
--- /dev/null
+++ b/Tests/bootstrap.bat.in
@@ -0,0 +1,2 @@
+@echo off
+sh "@CMake_SOURCE_DIR@/bootstrap" %*