[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.1 1.1.2.1 testNoBuild.cmake.in 1.2 1.2.2.1 testNoExe.cmake.in 1.2 1.2.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt testNoBuild.cmake.in testNoExe.cmake.in 
Log Message:
CMake 2.8.1-rc1


Index: testNoBuild.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestTestFailure/testNoBuild.cmake.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** testNoBuild.cmake.in	24 Sep 2009 17:43:25 -0000	1.2
--- testNoBuild.cmake.in	28 Jan 2010 21:48:12 -0000	1.2.2.1
***************
*** 9,14 ****
  SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestFailure")
  SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
- SET(CMAKE_TEST_MAKEPROGRAM              "@CMAKE_TEST_MAKEPROGRAM@")
- SET(MAKECOMMAND                         "@MAKECOMMAND@")
  SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
  SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
--- 9,12 ----
***************
*** 21,31 ****
  #CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
  
- 
- FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
- CMAKE_TEST_GENERATOR:STRING=@CMAKE_TEST_GENERATOR@
- CMAKE_TEST_MAKEPROGRAM:FILEPATH=@CMAKE_TEST_MAKEPROGRAM@
- MAKECOMMAND:STRING=@MAKECOMMAND@
- ")
- 
  CTEST_START(Experimental)
  #CTEST_UPDATE(SOURCE "${CTEST_SOURCE_DIRECTORY}" RETURN_VALUE res)
--- 19,22 ----

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestTestFailure/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** CMakeLists.txt	18 Sep 2009 16:16:38 -0000	1.1
--- CMakeLists.txt	28 Jan 2010 21:48:12 -0000	1.1.2.1
***************
*** 1,19 ****
  cmake_minimum_required (VERSION 2.6)
  PROJECT(CTestTestFailure)
! 
! SET(DART_ROOT "" CACHE STRING "" FORCE)
! ENABLE_TESTING()
! INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
! 
! GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH)
! SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest")
  
  ADD_EXECUTABLE (NoBuild badCode.cxx)
  TARGET_LINK_LIBRARIES (NoBuild ${EXTRA_LIBS})
  
- ENABLE_TESTING ()
- 
  ADD_TEST (TestNoExe NoBuild)
- 
- INCLUDE (CTest)
- 
--- 1,8 ----
  cmake_minimum_required (VERSION 2.6)
  PROJECT(CTestTestFailure)
! INCLUDE(CTest)
  
  ADD_EXECUTABLE (NoBuild badCode.cxx)
  TARGET_LINK_LIBRARIES (NoBuild ${EXTRA_LIBS})
  
  ADD_TEST (TestNoExe NoBuild)

Index: testNoExe.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestTestFailure/testNoExe.cmake.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** testNoExe.cmake.in	24 Sep 2009 17:18:49 -0000	1.2
--- testNoExe.cmake.in	28 Jan 2010 21:48:12 -0000	1.2.2.1
***************
*** 9,14 ****
  SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestFailure")
  SET(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
- SET(CMAKE_TEST_MAKEPROGRAM              "@CMAKE_TEST_MAKEPROGRAM@")
- SET(MAKECOMMAND                         "@MAKECOMMAND@")
  SET(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
  SET(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
--- 9,12 ----
***************
*** 21,31 ****
  #CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
  
- 
- FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
- CMAKE_TEST_GENERATOR:STRING=@CMAKE_TEST_GENERATOR@
- CMAKE_TEST_MAKEPROGRAM:FILEPATH=@CMAKE_TEST_MAKEPROGRAM@
- MAKECOMMAND:STRING=@MAKECOMMAND@
- ")
- 
  CTEST_START(Experimental)
  CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
--- 19,22 ----