[Cmake-commits] [cmake-commits] hoffman committed cmCTestBuildCommand.h 1.5 1.5.12.1 cmCTestConfigureCommand.h 1.5 1.5.12.1 cmCTestCoverageCommand.h 1.4 1.4.12.1 cmCTestCoverageHandler.cxx 1.51 1.51.2.1 cmCTestEmptyBinaryDirectoryCommand.h 1.4 1.4.2.1 cmCTestMemCheckCommand.h 1.4 1.4.12.1 cmCTestReadCustomFilesCommand.h 1.3 1.3.2.1 cmCTestRunScriptCommand.h 1.4 1.4.2.1 cmCTestSleepCommand.h 1.3 1.3.2.1 cmCTestStartCommand.h 1.5 1.5.2.1 cmCTestSubmitCommand.h 1.5 1.5.12.1 cmCTestUpdateCommand.h 1.5 1.5.12.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu May 15 15:40:02 EDT 2008
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv17340/Source/CTest
Modified Files:
Tag: CMake-2-6
cmCTestBuildCommand.h cmCTestConfigureCommand.h
cmCTestCoverageCommand.h cmCTestCoverageHandler.cxx
cmCTestEmptyBinaryDirectoryCommand.h cmCTestMemCheckCommand.h
cmCTestReadCustomFilesCommand.h cmCTestRunScriptCommand.h
cmCTestSleepCommand.h cmCTestStartCommand.h
cmCTestSubmitCommand.h cmCTestUpdateCommand.h
Log Message:
ENH: merge in from main tree
Index: cmCTestSubmitCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestSubmitCommand.h,v
retrieving revision 1.5
retrieving revision 1.5.12.1
diff -C 2 -d -r1.5 -r1.5.12.1
*** cmCTestSubmitCommand.h 29 Mar 2006 17:01:24 -0000 1.5
--- cmCTestSubmitCommand.h 15 May 2008 19:40:00 -0000 1.5.12.1
***************
*** 46,50 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_SUBMIT";}
/**
--- 46,50 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_submit";}
/**
***************
*** 62,66 ****
{
return
! " CTEST_SUBMIT([RETURN_VALUE res])\n"
"Submits the test results for the project.";
}
--- 62,66 ----
{
return
! " ctest_submit([RETURN_VALUE res])\n"
"Submits the test results for the project.";
}
Index: cmCTestStartCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestStartCommand.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C 2 -d -r1.5 -r1.5.2.1
*** cmCTestStartCommand.h 23 Jan 2008 15:28:01 -0000 1.5
--- cmCTestStartCommand.h 15 May 2008 19:39:59 -0000 1.5.2.1
***************
*** 52,56 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_START";}
/**
--- 52,56 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_start";}
/**
***************
*** 68,72 ****
{
return
! " CTEST_START(Model [TRACK <track>] [source [binary]])\n"
"Starts the testing for a given model. The command should be called "
"after the binary directory is initialized. If the 'source' and "
--- 68,72 ----
{
return
! " ctest_start(Model [TRACK <track>] [source [binary]])\n"
"Starts the testing for a given model. The command should be called "
"after the binary directory is initialized. If the 'source' and "
Index: cmCTestMemCheckCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestMemCheckCommand.h,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -C 2 -d -r1.4 -r1.4.12.1
*** cmCTestMemCheckCommand.h 10 Mar 2006 20:03:09 -0000 1.4
--- cmCTestMemCheckCommand.h 15 May 2008 19:39:59 -0000 1.4.12.1
***************
*** 47,51 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_MEMCHECK";}
/**
--- 47,51 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_memcheck";}
/**
***************
*** 63,67 ****
{
return
! " CTEST_MEMCHECK([BUILD build_dir] [RETURN_VALUE res])\n"
"Performs a memory checking of tests in the given build directory and "
"stores results in MemCheck.xml. The second argument is a variable "
--- 63,67 ----
{
return
! " ctest_memcheck([BUILD build_dir] [RETURN_VALUE res])\n"
"Performs a memory checking of tests in the given build directory and "
"stores results in MemCheck.xml. The second argument is a variable "
Index: cmCTestSleepCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestSleepCommand.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** cmCTestSleepCommand.h 23 Jan 2008 15:28:01 -0000 1.3
--- cmCTestSleepCommand.h 15 May 2008 19:39:59 -0000 1.3.2.1
***************
*** 53,57 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_SLEEP";}
/**
--- 53,57 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_sleep";}
/**
***************
*** 69,74 ****
{
return
! " CTEST_SLEEP( seconds )\n"
! " CTEST_SLEEP( time1 duration time2 )\n"
"With one argument it will sleep for a given number of seconds. "
"With three arguments it will wait for time2 - time1 - duration "
--- 69,74 ----
{
return
! " ctest_sleep( seconds )\n"
! " ctest_sleep( time1 duration time2 )\n"
"With one argument it will sleep for a given number of seconds. "
"With three arguments it will wait for time2 - time1 - duration "
Index: cmCTestCoverageCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageCommand.h,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -C 2 -d -r1.4 -r1.4.12.1
*** cmCTestCoverageCommand.h 29 Mar 2006 17:01:24 -0000 1.4
--- cmCTestCoverageCommand.h 15 May 2008 19:39:58 -0000 1.4.12.1
***************
*** 45,49 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_COVERAGE";}
/**
--- 45,49 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_coverage";}
/**
***************
*** 61,65 ****
{
return
! " CTEST_COVERAGE([BUILD build_dir] [RETURN_VALUE res])\n"
"Perform the coverage of the given build directory and stores results "
"in Coverage.xml. The second argument is a variable that will hold "
--- 61,65 ----
{
return
! " ctest_coverage([BUILD build_dir] [RETURN_VALUE res])\n"
"Perform the coverage of the given build directory and stores results "
"in Coverage.xml. The second argument is a variable that will hold "
Index: cmCTestEmptyBinaryDirectoryCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** cmCTestEmptyBinaryDirectoryCommand.h 23 Jan 2008 15:28:01 -0000 1.4
--- cmCTestEmptyBinaryDirectoryCommand.h 15 May 2008 19:39:59 -0000 1.4.2.1
***************
*** 54,58 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_EMPTY_BINARY_DIRECTORY";}
/**
--- 54,58 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_empty_binary_directory";}
/**
***************
*** 70,74 ****
{
return
! " CTEST_EMPTY_BINARY_DIRECTORY( directory )\n"
"Removes a binary directory. This command will perform some checks "
"prior to deleting the directory in an attempt to avoid malicious "
--- 70,74 ----
{
return
! " ctest_empty_binary_directory( directory )\n"
"Removes a binary directory. This command will perform some checks "
"prior to deleting the directory in an attempt to avoid malicious "
Index: cmCTestReadCustomFilesCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestReadCustomFilesCommand.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** cmCTestReadCustomFilesCommand.h 23 Jan 2008 15:28:01 -0000 1.3
--- cmCTestReadCustomFilesCommand.h 15 May 2008 19:39:59 -0000 1.3.2.1
***************
*** 52,56 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_READ_CUSTOM_FILES";}
/**
--- 52,56 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_read_custom_files";}
/**
***************
*** 68,72 ****
{
return
! " CTEST_READ_CUSTOM_FILES( directory ... )\n"
"Read all the CTestCustom.ctest or CTestCustom.cmake files from "
"the given directory.";
--- 68,72 ----
{
return
! " ctest_read_custom_files( directory ... )\n"
"Read all the CTestCustom.ctest or CTestCustom.cmake files from "
"the given directory.";
Index: cmCTestBuildCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildCommand.h,v
retrieving revision 1.5
retrieving revision 1.5.12.1
diff -C 2 -d -r1.5 -r1.5.12.1
*** cmCTestBuildCommand.h 29 Mar 2006 17:01:24 -0000 1.5
--- cmCTestBuildCommand.h 15 May 2008 19:39:57 -0000 1.5.12.1
***************
*** 48,52 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_BUILD";}
/**
--- 48,52 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_build";}
/**
***************
*** 64,68 ****
{
return
! " CTEST_BUILD([BUILD build_dir] [RETURN_VALUE res])\n"
"Builds the given build directory and stores results in Build.xml.";
}
--- 64,68 ----
{
return
! " ctest_build([BUILD build_dir] [RETURN_VALUE res])\n"
"Builds the given build directory and stores results in Build.xml.";
}
Index: cmCTestConfigureCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestConfigureCommand.h,v
retrieving revision 1.5
retrieving revision 1.5.12.1
diff -C 2 -d -r1.5 -r1.5.12.1
*** cmCTestConfigureCommand.h 29 Mar 2006 17:01:24 -0000 1.5
--- cmCTestConfigureCommand.h 15 May 2008 19:39:58 -0000 1.5.12.1
***************
*** 45,49 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_CONFIGURE";}
/**
--- 45,49 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_configure";}
/**
***************
*** 61,65 ****
{
return
! " CTEST_CONFIGURE(BUILD build_dir RETURN_VALUE res)\n"
"Configures the given build directory and stores results in "
"Configure.xml. The second argument is a variable that will hold "
--- 61,65 ----
{
return
! " ctest_configure(BUILD build_dir RETURN_VALUE res)\n"
"Configures the given build directory and stores results in "
"Configure.xml. The second argument is a variable that will hold "
Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -C 2 -d -r1.51 -r1.51.2.1
*** cmCTestCoverageHandler.cxx 30 Jan 2008 16:17:36 -0000 1.51
--- cmCTestCoverageHandler.cxx 15 May 2008 19:39:58 -0000 1.51.2.1
***************
*** 539,543 ****
<< "\" FullPath=\"" << this->CTest->MakeXMLSafe(
this->CTest->GetShortPathToFile(fullFileName.c_str()))
! << "\" Covered=\"" << (tested==0?"true":"false") << "\">\n"
<< "\t\t<LOCTested>" << tested << "</LOCTested>\n"
<< "\t\t<LOCUnTested>" << untested << "</LOCUnTested>\n"
--- 539,543 ----
<< "\" FullPath=\"" << this->CTest->MakeXMLSafe(
this->CTest->GetShortPathToFile(fullFileName.c_str()))
! << "\" Covered=\"" << (tested > 0 ? "true":"false") << "\">\n"
<< "\t\t<LOCTested>" << tested << "</LOCTested>\n"
<< "\t\t<LOCUnTested>" << untested << "</LOCUnTested>\n"
***************
*** 707,710 ****
--- 707,712 ----
cmCTestLog(this->CTest, HANDLER_OUTPUT, " ");
int file_count = 0;
+ // make sure output from gcov is in English!
+ cmSystemTools::PutEnv("LC_ALL=POSIX");
for ( it = files.begin(); it != files.end(); ++ it )
{
Index: cmCTestRunScriptCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunScriptCommand.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** cmCTestRunScriptCommand.h 23 Jan 2008 15:28:01 -0000 1.4
--- cmCTestRunScriptCommand.h 15 May 2008 19:39:59 -0000 1.4.2.1
***************
*** 53,57 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_RUN_SCRIPT";}
/**
--- 53,57 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_run_script";}
/**
***************
*** 69,73 ****
{
return
! " CTEST_RUN_SCRIPT([NEW_PROCESS] script_file_name script_file_name1 \n"
" script_file_name2 ...)\n"
"Runs a script or scripts much like if it was run from ctest -S. "
--- 69,73 ----
{
return
! " ctest_run_script([NEW_PROCESS] script_file_name script_file_name1 \n"
" script_file_name2 ...)\n"
"Runs a script or scripts much like if it was run from ctest -S. "
Index: cmCTestUpdateCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateCommand.h,v
retrieving revision 1.5
retrieving revision 1.5.12.1
diff -C 2 -d -r1.5 -r1.5.12.1
*** cmCTestUpdateCommand.h 29 Mar 2006 17:01:24 -0000 1.5
--- cmCTestUpdateCommand.h 15 May 2008 19:40:00 -0000 1.5.12.1
***************
*** 45,49 ****
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "CTEST_UPDATE";}
/**
--- 45,49 ----
* The name of the command as specified in CMakeList.txt.
*/
! virtual const char* GetName() { return "ctest_update";}
/**
***************
*** 61,65 ****
{
return
! " CTEST_UPDATE([SOURCE source] [RETURN_VALUE res])\n"
"Updates the given source directory and stores results in Update.xml. "
"The second argument is a variable that will hold the number of files "
--- 61,65 ----
{
return
! " ctest_update([SOURCE source] [RETURN_VALUE res])\n"
"Updates the given source directory and stores results in Update.xml. "
"The second argument is a variable that will hold the number of files "
More information about the Cmake-commits
mailing list