[cmake-commits] martink committed
cmCTestEmptyBinaryDirectoryCommand.cxx 1.3 1.4
cmCTestEmptyBinaryDirectoryCommand.h 1.3 1.4
cmCTestHandlerCommand.cxx 1.10 1.11 cmCTestHandlerCommand.h 1.3
1.4 cmCTestReadCustomFilesCommand.cxx 1.3 1.4
cmCTestReadCustomFilesCommand.h 1.2 1.3
cmCTestRunScriptCommand.cxx 1.6 1.7 cmCTestRunScriptCommand.h
1.3 1.4 cmCTestScriptHandler.cxx 1.42 1.43
cmCTestSleepCommand.cxx 1.3 1.4 cmCTestSleepCommand.h 1.2 1.3
cmCTestStartCommand.cxx 1.15 1.16 cmCTestStartCommand.h 1.4 1.5
cmCTestTestHandler.cxx 1.63 1.64
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jan 23 10:28:03 EST 2008
Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv25407/CTest
Modified Files:
cmCTestEmptyBinaryDirectoryCommand.cxx
cmCTestEmptyBinaryDirectoryCommand.h cmCTestHandlerCommand.cxx
cmCTestHandlerCommand.h cmCTestReadCustomFilesCommand.cxx
cmCTestReadCustomFilesCommand.h cmCTestRunScriptCommand.cxx
cmCTestRunScriptCommand.h cmCTestScriptHandler.cxx
cmCTestSleepCommand.cxx cmCTestSleepCommand.h
cmCTestStartCommand.cxx cmCTestStartCommand.h
cmCTestTestHandler.cxx
Log Message:
ENH: add return and break support to cmake, also change basic command invocation signature to be able to return extra informaiton via the cmExecutionStatus class
Index: cmCTestSleepCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestSleepCommand.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmCTestSleepCommand.cxx 10 Mar 2006 20:03:09 -0000 1.3
+++ cmCTestSleepCommand.cxx 23 Jan 2008 15:28:01 -0000 1.4
@@ -19,8 +19,8 @@
#include "cmCTestScriptHandler.h"
#include <stdlib.h> // required for atoi
-bool cmCTestSleepCommand::InitialPass(
- std::vector<std::string> const& args)
+bool cmCTestSleepCommand
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
if (args.size() < 1)
{
Index: cmCTestStartCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestStartCommand.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cmCTestStartCommand.cxx 14 Aug 2006 14:51:08 -0000 1.15
+++ cmCTestStartCommand.cxx 23 Jan 2008 15:28:01 -0000 1.16
@@ -20,8 +20,8 @@
#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
-bool cmCTestStartCommand::InitialPass(
- std::vector<std::string> const& args)
+bool cmCTestStartCommand
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
if (args.size() < 1)
{
Index: cmCTestStartCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestStartCommand.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmCTestStartCommand.h 28 Apr 2006 15:59:31 -0000 1.4
+++ cmCTestStartCommand.h 23 Jan 2008 15:28:01 -0000 1.5
@@ -45,7 +45,8 @@
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
- virtual bool InitialPass(std::vector<std::string> const& args);
+ virtual bool InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus &status);
/**
* The name of the command as specified in CMakeList.txt.
Index: cmCTestEmptyBinaryDirectoryCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmCTestEmptyBinaryDirectoryCommand.h 10 Mar 2006 20:03:09 -0000 1.3
+++ cmCTestEmptyBinaryDirectoryCommand.h 23 Jan 2008 15:28:01 -0000 1.4
@@ -47,7 +47,8 @@
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
- virtual bool InitialPass(std::vector<std::string> const& args);
+ virtual bool InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus &status);
/**
* The name of the command as specified in CMakeList.txt.
Index: cmCTestSleepCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestSleepCommand.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmCTestSleepCommand.h 10 Mar 2006 20:03:09 -0000 1.2
+++ cmCTestSleepCommand.h 23 Jan 2008 15:28:01 -0000 1.3
@@ -46,7 +46,8 @@
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
- virtual bool InitialPass(std::vector<std::string> const& args);
+ virtual bool InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus &status);
/**
* The name of the command as specified in CMakeList.txt.
Index: cmCTestReadCustomFilesCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestReadCustomFilesCommand.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmCTestReadCustomFilesCommand.cxx 9 Apr 2006 11:45:18 -0000 1.3
+++ cmCTestReadCustomFilesCommand.cxx 23 Jan 2008 15:28:01 -0000 1.4
@@ -18,8 +18,8 @@
#include "cmCTest.h"
-bool cmCTestReadCustomFilesCommand::InitialPass(
- std::vector<std::string> const& args)
+bool cmCTestReadCustomFilesCommand
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
if (args.size() < 1)
{
Index: cmCTestScriptHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestScriptHandler.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- cmCTestScriptHandler.cxx 13 Dec 2007 22:56:49 -0000 1.42
+++ cmCTestScriptHandler.cxx 23 Jan 2008 15:28:01 -0000 1.43
@@ -65,7 +65,8 @@
cmCTestScriptFunctionBlocker() {}
virtual ~cmCTestScriptFunctionBlocker() {}
virtual bool IsFunctionBlocked(const cmListFileFunction& lff,
- cmMakefile &mf);
+ cmMakefile &mf,
+ cmExecutionStatus &);
//virtual bool ShouldRemove(const cmListFileFunction& lff, cmMakefile &mf);
//virtual void ScopeEnded(cmMakefile &mf);
@@ -74,7 +75,8 @@
// simply update the time and don't block anything
bool cmCTestScriptFunctionBlocker::
-IsFunctionBlocked(const cmListFileFunction& , cmMakefile &)
+IsFunctionBlocked(const cmListFileFunction& , cmMakefile &,
+ cmExecutionStatus &)
{
this->CTestScriptHandler->UpdateElapsedTime();
return false;
Index: cmCTestHandlerCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestHandlerCommand.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cmCTestHandlerCommand.cxx 27 Jul 2006 13:40:21 -0000 1.10
+++ cmCTestHandlerCommand.cxx 23 Jan 2008 15:28:01 -0000 1.11
@@ -35,8 +35,8 @@
this->Last = ct_LAST;
}
-bool cmCTestHandlerCommand::InitialPass(
- std::vector<std::string> const& args)
+bool cmCTestHandlerCommand
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
if ( !this->ProcessArguments(args, (unsigned int)this->Last,
&*this->Arguments.begin(),this->Values) )
Index: cmCTestRunScriptCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunScriptCommand.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cmCTestRunScriptCommand.cxx 4 Apr 2006 17:04:28 -0000 1.6
+++ cmCTestRunScriptCommand.cxx 23 Jan 2008 15:28:01 -0000 1.7
@@ -18,8 +18,8 @@
#include "cmCTestScriptHandler.h"
-bool cmCTestRunScriptCommand::InitialPass(
- std::vector<std::string> const& args)
+bool cmCTestRunScriptCommand
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
if(args.size() < 1 )
{
Index: cmCTestRunScriptCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestRunScriptCommand.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmCTestRunScriptCommand.h 4 Apr 2006 17:04:28 -0000 1.3
+++ cmCTestRunScriptCommand.h 23 Jan 2008 15:28:01 -0000 1.4
@@ -46,7 +46,8 @@
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
- virtual bool InitialPass(std::vector<std::string> const& args);
+ virtual bool InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus &status);
/**
* The name of the command as specified in CMakeList.txt.
Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- cmCTestTestHandler.cxx 19 Jan 2008 20:09:36 -0000 1.63
+++ cmCTestTestHandler.cxx 23 Jan 2008 15:28:01 -0000 1.64
@@ -53,7 +53,8 @@
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
- virtual bool InitialPass(std::vector<std::string> const& args);
+ virtual bool InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus &);
/**
* The name of the command as specified in CMakeList.txt.
@@ -70,7 +71,8 @@
};
//----------------------------------------------------------------------
-bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args)
+bool cmCTestSubdirCommand
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
if(args.size() < 1 )
{
@@ -139,7 +141,8 @@
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
- virtual bool InitialPass(std::vector<std::string> const& args);
+ virtual bool InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus &);
/**
* The name of the command as specified in CMakeList.txt.
@@ -157,7 +160,7 @@
//----------------------------------------------------------------------
bool cmCTestAddSubdirectoryCommand
-::InitialPass(std::vector<std::string> const& args)
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
if(args.size() < 1 )
{
@@ -223,7 +226,8 @@
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
- virtual bool InitialPass(std::vector<std::string> const&);
+ virtual bool InitialPass(std::vector<std::string> const&,
+ cmExecutionStatus &);
/**
* The name of the command as specified in CMakeList.txt.
@@ -240,7 +244,8 @@
};
//----------------------------------------------------------------------
-bool cmCTestAddTestCommand::InitialPass(std::vector<std::string> const& args)
+bool cmCTestAddTestCommand
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
if ( args.size() < 2 )
{
@@ -268,8 +273,9 @@
/**
* This is called when the command is first encountered in
* the CMakeLists.txt file.
- */
- virtual bool InitialPass(std::vector<std::string> const&);
+ */
+ virtual bool InitialPass(std::vector<std::string> const&,
+ cmExecutionStatus &);
/**
* The name of the command as specified in CMakeList.txt.
@@ -286,8 +292,8 @@
};
//----------------------------------------------------------------------
-bool cmCTestSetTestsPropertiesCommand::InitialPass(
- std::vector<std::string> const& args)
+bool cmCTestSetTestsPropertiesCommand
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
return this->TestHandler->SetTestsProperties(args);
}
Index: cmCTestReadCustomFilesCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestReadCustomFilesCommand.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmCTestReadCustomFilesCommand.h 10 May 2006 17:48:21 -0000 1.2
+++ cmCTestReadCustomFilesCommand.h 23 Jan 2008 15:28:01 -0000 1.3
@@ -45,7 +45,8 @@
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
- virtual bool InitialPass(std::vector<std::string> const& args);
+ virtual bool InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus &status);
/**
* The name of the command as specified in CMakeList.txt.
Index: cmCTestHandlerCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestHandlerCommand.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmCTestHandlerCommand.h 10 Mar 2006 20:03:09 -0000 1.3
+++ cmCTestHandlerCommand.h 23 Jan 2008 15:28:01 -0000 1.4
@@ -35,7 +35,8 @@
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
- virtual bool InitialPass(std::vector<std::string> const& args);
+ virtual bool InitialPass(std::vector<std::string> const& args,
+ cmExecutionStatus &status);
cmTypeMacro(cmCTestHandlerCommand, cmCTestCommand);
Index: cmCTestEmptyBinaryDirectoryCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmCTestEmptyBinaryDirectoryCommand.cxx 12 Jul 2005 14:40:14 -0000 1.3
+++ cmCTestEmptyBinaryDirectoryCommand.cxx 23 Jan 2008 15:28:01 -0000 1.4
@@ -18,8 +18,8 @@
#include "cmCTestScriptHandler.h"
-bool cmCTestEmptyBinaryDirectoryCommand::InitialPass(
- std::vector<std::string> const& args)
+bool cmCTestEmptyBinaryDirectoryCommand
+::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
{
if(args.size() != 1 )
{
More information about the Cmake-commits
mailing list