ENH: remove debugging output

This commit is contained in:
Ken Martin 2006-05-25 10:21:46 -04:00
parent ec2104cd31
commit 60ebc57227
1 changed files with 20 additions and 15 deletions

View File

@ -1,7 +1,7 @@
# - setup CTest # - setup CTest
# This file configures a project to use the CTest/Dart testing/dashboard process. # This file configures a project to use the CTest/Dart
# # testing/dashboard process.
OPTION(BUILD_TESTING "Build the testing tree." ON) # OPTION(BUILD_TESTING "Build the testing tree." ON)
IF(BUILD_TESTING) IF(BUILD_TESTING)
# Setup some auxilary macros # Setup some auxilary macros
@ -81,9 +81,9 @@ IF(BUILD_TESTING)
SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM}) SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
FIND_PROGRAM(CVSCOMMAND cvs ) FIND_PROGRAM(CVSCOMMAND cvs )
SET(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING "Options passed to the cvs update command.") SET(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING
"Options passed to the cvs update command.")
FIND_PROGRAM(SVNCOMMAND svn) FIND_PROGRAM(SVNCOMMAND svn)
#SET(SVN_UPDATE_OPTIONS "-d -A -P" CACHE STRING "Options passed to the svn update command.")
IF(NOT UPDATE_TYPE) IF(NOT UPDATE_TYPE)
IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS") IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS")
@ -100,18 +100,17 @@ IF(BUILD_TESTING)
ENDIF(NOT UPDATE_TYPE) ENDIF(NOT UPDATE_TYPE)
IF(UPDATE_TYPE MATCHES "[Cc][Vv][Ss]") IF(UPDATE_TYPE MATCHES "[Cc][Vv][Ss]")
MESSAGE(STATUS "This is a CVS repository")
SET(UPDATE_COMMAND "${CVSCOMMAND}") SET(UPDATE_COMMAND "${CVSCOMMAND}")
SET(UPDATE_OPTIONS "${CVS_UPDATE_OPTIONS}") SET(UPDATE_OPTIONS "${CVS_UPDATE_OPTIONS}")
ELSE(UPDATE_TYPE MATCHES "[Cc][Vv][Ss]") ELSE(UPDATE_TYPE MATCHES "[Cc][Vv][Ss]")
IF(UPDATE_TYPE MATCHES "[Ss][Vv][Nn]") IF(UPDATE_TYPE MATCHES "[Ss][Vv][Nn]")
MESSAGE(STATUS "This is a SVN repository")
SET(UPDATE_COMMAND "${SVNCOMMAND}") SET(UPDATE_COMMAND "${SVNCOMMAND}")
SET(UPDATE_OPTIONS "${SVN_UPDATE_OPTIONS}") SET(UPDATE_OPTIONS "${SVN_UPDATE_OPTIONS}")
ENDIF(UPDATE_TYPE MATCHES "[Ss][Vv][Nn]") ENDIF(UPDATE_TYPE MATCHES "[Ss][Vv][Nn]")
ENDIF(UPDATE_TYPE MATCHES "[Cc][Vv][Ss]") ENDIF(UPDATE_TYPE MATCHES "[Cc][Vv][Ss]")
SET(DART_TESTING_TIMEOUT 1500 CACHE STRING "MAximum time allowed before CTest will kill the test.") SET(DART_TESTING_TIMEOUT 1500 CACHE STRING
"Maximum time allowed before CTest will kill the test.")
FIND_PROGRAM(MEMORYCHECK_COMMAND FIND_PROGRAM(MEMORYCHECK_COMMAND
NAMES purify valgrind boundscheck NAMES purify valgrind boundscheck
@ -119,9 +118,14 @@ IF(BUILD_TESTING)
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Rational Software\\Purify\\Setup;InstallFolder]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Rational Software\\Purify\\Setup;InstallFolder]"
DOC "Path to the memory checking command, used for memory error detection." DOC "Path to the memory checking command, used for memory error detection."
) )
SET(MEMORYCHECK_SUPPRESSIONS_FILE "" CACHE FILEPATH "File that contains suppressions for the memory checker") SET(MEMORYCHECK_SUPPRESSIONS_FILE "" CACHE FILEPATH
FIND_PROGRAM(SCPCOMMAND scp DOC "Path to scp command, used by CTest for submitting results to a Dart server") "File that contains suppressions for the memory checker")
FIND_PROGRAM(COVERAGE_COMMAND gcov DOC "Path to the coverage program that CTest uses for performing coverage inspection") FIND_PROGRAM(SCPCOMMAND scp DOC
"Path to scp command, used by CTest for submitting results to a Dart server"
)
FIND_PROGRAM(COVERAGE_COMMAND gcov DOC
"Path to the coverage program that CTest uses for performing coverage inspection"
)
# set the site name # set the site name
SITE_NAME(SITE) SITE_NAME(SITE)
@ -146,9 +150,11 @@ IF(BUILD_TESTING)
SET(BUILD_NAME_SYSTEM_NAME "Win32") SET(BUILD_NAME_SYSTEM_NAME "Win32")
ENDIF(WIN32) ENDIF(WIN32)
IF(UNIX OR BORLAND) IF(UNIX OR BORLAND)
GET_FILENAME_COMPONENT(DART_CXX_NAME "${CMAKE_CXX_COMPILER}" ${DART_NAME_COMPONENT}) GET_FILENAME_COMPONENT(DART_CXX_NAME
"${CMAKE_CXX_COMPILER}" ${DART_NAME_COMPONENT})
ELSE(UNIX OR BORLAND) ELSE(UNIX OR BORLAND)
GET_FILENAME_COMPONENT(DART_CXX_NAME "${CMAKE_BUILD_TOOL}" ${DART_NAME_COMPONENT}) GET_FILENAME_COMPONENT(DART_CXX_NAME
"${CMAKE_BUILD_TOOL}" ${DART_NAME_COMPONENT})
ENDIF(UNIX OR BORLAND) ENDIF(UNIX OR BORLAND)
IF(DART_CXX_NAME MATCHES "msdev") IF(DART_CXX_NAME MATCHES "msdev")
SET(DART_CXX_NAME "vs60") SET(DART_CXX_NAME "vs60")
@ -165,7 +171,6 @@ IF(BUILD_TESTING)
ENDIF(CMAKE_GENERATOR MATCHES "^Visual Studio 7$") ENDIF(CMAKE_GENERATOR MATCHES "^Visual Studio 7$")
ENDIF(DART_CXX_NAME MATCHES "devenv") ENDIF(DART_CXX_NAME MATCHES "devenv")
SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}") SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")
MESSAGE(STATUS "Using Buildname: ${BUILDNAME}")
ENDIF(NOT BUILDNAME) ENDIF(NOT BUILDNAME)
# set the build command # set the build command
BUILD_COMMAND(MAKECOMMAND ${MAKEPROGRAM} ) BUILD_COMMAND(MAKECOMMAND ${MAKEPROGRAM} )