[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.2 1.2.2.1 test.cmake.in 1.3.2.1 1.3.2.2

[cmake-commits at cmake.org]

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

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


Index: test.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestTestParallel/test.cmake.in,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C 2 -d -r1.3.2.1 -r1.3.2.2
*** test.cmake.in	1 Oct 2009 21:21:22 -0000	1.3.2.1
--- test.cmake.in	28 Jan 2010 21:48:12 -0000	1.3.2.2
***************
*** 9,14 ****
  SET(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestParallel")
  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,30 ****
  #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_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
--- 19,22 ----

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestTestParallel/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** CMakeLists.txt	23 Sep 2009 15:38:37 -0000	1.2
--- CMakeLists.txt	28 Jan 2010 21:48:12 -0000	1.2.2.1
***************
*** 1,16 ****
  cmake_minimum_required (VERSION 2.6)
  PROJECT(CTestTestParallel)
! 
! 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 (LockFile lockFile.c)
  
- ENABLE_TESTING ()
- 
  ADD_TEST (TestRunSerial1 LockFile)
  ADD_TEST (TestRunSerial2 LockFile)
--- 1,8 ----
  cmake_minimum_required (VERSION 2.6)
  PROJECT(CTestTestParallel)
! INCLUDE(CTest)
  
  ADD_EXECUTABLE (LockFile lockFile.c)
  
  ADD_TEST (TestRunSerial1 LockFile)
  ADD_TEST (TestRunSerial2 LockFile)
***************
*** 20,23 ****
  ADD_TEST (TestProcessorsGreaterThanMPL2 LockFile)
  SET_TESTS_PROPERTIES(TestProcessorsGreaterThanMPL1 PROPERTIES PROCESSORS 10)
- 
- INCLUDE (CTest)
--- 12,13 ----