[Cmake-commits] [cmake-commits] hoffman committed test.cmake.in 1.16 1.16.12.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/CTestTest
In directory public:/mounts/ram/cvs-serv13963/Tests/CTestTest

Modified Files:
      Tag: CMake-2-8
	test.cmake.in 
Log Message:
Merge in changes for RC 3


Index: test.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CTestTest/test.cmake.in,v
retrieving revision 1.16
retrieving revision 1.16.12.1
diff -C 2 -d -r1.16 -r1.16.12.1
*** test.cmake.in	24 Jul 2006 13:43:11 -0000	1.16
--- test.cmake.in	9 Oct 2009 20:11:43 -0000	1.16.12.1
***************
*** 5,14 ****
  
  # this is the cvs module name that should be checked out
! SET (CTEST_MODULE_NAME kwsys)
  
  # these are the the name of the source and binary directory on disk. 
  # They will be appended to DASHBOARD_ROOT
! SET (CTEST_SOURCE_NAME kwsys)
! SET (CTEST_BINARY_NAME kwsysBin)
  
  # which ctest command to use for running the dashboard
--- 5,14 ----
  
  # this is the cvs module name that should be checked out
! SET (CTEST_MODULE_NAME SmallAndFast)
  
  # these are the the name of the source and binary directory on disk. 
  # They will be appended to DASHBOARD_ROOT
! SET (CTEST_SOURCE_NAME SmallAndFast)
! SET (CTEST_BINARY_NAME SmallAndFastBuild)
  
  # which ctest command to use for running the dashboard
***************
*** 25,30 ****
  MESSAGE("CMake executable: ${CTEST_CMAKE_COMMAND}")
  
! CTEST_SLEEP(5)
! CTEST_SLEEP(5 5 7)
  
  ####################################################################
--- 25,30 ----
  MESSAGE("CMake executable: ${CTEST_CMAKE_COMMAND}")
  
! CTEST_SLEEP(1)
! CTEST_SLEEP(1 1 1)
  
  ####################################################################
***************
*** 40,44 ****
  SET (CTEST_INITIAL_CACHE "
  SITE:STRING=@SITE@
! BUILDNAME:STRING=KWSys- at BUILDNAME@
  CMAKE_GENERATOR:INTERNAL=@CMAKE_GENERATOR@
  CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
--- 40,44 ----
  SET (CTEST_INITIAL_CACHE "
  SITE:STRING=@SITE@
! BUILDNAME:STRING=SmallAndFast- at BUILDNAME@
  CMAKE_GENERATOR:INTERNAL=@CMAKE_GENERATOR@
  CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
***************
*** 53,59 ****
  MEMORYCHECK_COMMAND_OPTIONS:STRING=@MEMORYCHECK_COMMAND_OPTIONS@
  COVERAGE_COMMAND:FILEPATH=@COVERAGE_COMMAND@
- 
- # This one is needed for testing advanced ctest features
- CTEST_TEST_KWSYS:BOOL=ON
  ")
  
--- 53,56 ----
***************
*** 68,71 ****
  )
  
! SET (CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Source/kwsys")
  SET (CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTest/${CTEST_BINARY_NAME}")
--- 65,68 ----
  )
  
! SET (CTEST_SOURCE_DIRECTORY "@CMake_SOURCE_DIR@/Tests/CTestTest/SmallAndFast")
  SET (CTEST_BINARY_DIRECTORY "@CMake_BINARY_DIR@/Tests/CTestTest/${CTEST_BINARY_NAME}")