STYLE: fix line length
This commit is contained in:
parent
26e75041fa
commit
aae0bcdacf
|
@ -54,7 +54,8 @@ void cmCTestGenericHandler::SetOption(const char* op, const char* value)
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
void cmCTestGenericHandler::SetPersistentOption(const char* op, const char* value)
|
void cmCTestGenericHandler::SetPersistentOption(const char* op,
|
||||||
|
const char* value)
|
||||||
{
|
{
|
||||||
this->SetOption(op, value);
|
this->SetOption(op, value);
|
||||||
if ( !op )
|
if ( !op )
|
||||||
|
|
|
@ -38,8 +38,8 @@ cmCTestHandlerCommand::cmCTestHandlerCommand()
|
||||||
bool cmCTestHandlerCommand::InitialPass(
|
bool cmCTestHandlerCommand::InitialPass(
|
||||||
std::vector<std::string> const& args)
|
std::vector<std::string> const& args)
|
||||||
{
|
{
|
||||||
if ( !this->ProcessArguments(args, (unsigned int)this->Last, &*this->Arguments.begin(),
|
if ( !this->ProcessArguments(args, (unsigned int)this->Last,
|
||||||
this->Values) )
|
&*this->Arguments.begin(),this->Values) )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,8 +67,8 @@ public:
|
||||||
{
|
{
|
||||||
return
|
return
|
||||||
" CTEST_READ_CUSTOM_FILES( directory ... )\n"
|
" CTEST_READ_CUSTOM_FILES( directory ... )\n"
|
||||||
"Read all the CTestCustom.ctest or CTestCustom.cmake files from the given "
|
"Read all the CTestCustom.ctest or CTestCustom.cmake files from "
|
||||||
"directory.";
|
"the given directory.";
|
||||||
}
|
}
|
||||||
|
|
||||||
cmTypeMacro(cmCTestReadCustomFilesCommand, cmCTestCommand);
|
cmTypeMacro(cmCTestReadCustomFilesCommand, cmCTestCommand);
|
||||||
|
|
|
@ -167,7 +167,8 @@ cmCTestScriptHandler::~cmCTestScriptHandler()
|
||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
// just adds an argument to the vector
|
// just adds an argument to the vector
|
||||||
void cmCTestScriptHandler::AddConfigurationScript(const char *script, bool pscope)
|
void cmCTestScriptHandler::AddConfigurationScript(const char *script,
|
||||||
|
bool pscope)
|
||||||
{
|
{
|
||||||
this->ConfigurationScripts.push_back(script);
|
this->ConfigurationScripts.push_back(script);
|
||||||
this->ScriptProcessScope.push_back(pscope);
|
this->ScriptProcessScope.push_back(pscope);
|
||||||
|
@ -253,7 +254,8 @@ int cmCTestScriptHandler::ExecuteScript(const std::string& total_script_arg)
|
||||||
int pipe = cmSystemTools::WaitForLine(cp, line, 100.0, out, err);
|
int pipe = cmSystemTools::WaitForLine(cp, line, 100.0, out, err);
|
||||||
while(pipe != cmsysProcess_Pipe_None)
|
while(pipe != cmsysProcess_Pipe_None)
|
||||||
{
|
{
|
||||||
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Output: " << line << "\n");
|
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Output: "
|
||||||
|
<< line << "\n");
|
||||||
if(pipe == cmsysProcess_Pipe_STDERR)
|
if(pipe == cmsysProcess_Pipe_STDERR)
|
||||||
{
|
{
|
||||||
cmCTestLog(this->CTest, ERROR_MESSAGE, line << "\n");
|
cmCTestLog(this->CTest, ERROR_MESSAGE, line << "\n");
|
||||||
|
@ -927,7 +929,8 @@ void cmCTestScriptHandler::RestoreBackupDirectories()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cmCTestScriptHandler::RunScript(cmCTest* ctest, const char *sname, bool InProcess)
|
bool cmCTestScriptHandler::RunScript(cmCTest* ctest, const char *sname,
|
||||||
|
bool InProcess)
|
||||||
{
|
{
|
||||||
cmCTestScriptHandler* sh = new cmCTestScriptHandler();
|
cmCTestScriptHandler* sh = new cmCTestScriptHandler();
|
||||||
sh->SetCTestInstance(ctest);
|
sh->SetCTestInstance(ctest);
|
||||||
|
|
|
@ -111,8 +111,9 @@ bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args)
|
||||||
}
|
}
|
||||||
fname += "/";
|
fname += "/";
|
||||||
fname += testFilename;
|
fname += testFilename;
|
||||||
bool readit = this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(),
|
bool readit =
|
||||||
fname.c_str());
|
this->Makefile->ReadListFile(this->Makefile->GetCurrentListFile(),
|
||||||
|
fname.c_str());
|
||||||
cmSystemTools::ChangeDirectory(cwd.c_str());
|
cmSystemTools::ChangeDirectory(cwd.c_str());
|
||||||
if(!readit)
|
if(!readit)
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,7 +51,8 @@ cmCTestGenericHandler* cmCTestUpdateCommand::InitializeHandler()
|
||||||
= this->Makefile->GetDefinition("CTEST_CHECKOUT_COMMAND");
|
= this->Makefile->GetDefinition("CTEST_CHECKOUT_COMMAND");
|
||||||
if ( !initialCheckoutCommand )
|
if ( !initialCheckoutCommand )
|
||||||
{
|
{
|
||||||
initialCheckoutCommand = this->Makefile->GetDefinition("CTEST_CVS_CHECKOUT");
|
initialCheckoutCommand =
|
||||||
|
this->Makefile->GetDefinition("CTEST_CVS_CHECKOUT");
|
||||||
}
|
}
|
||||||
|
|
||||||
cmCTestGenericHandler* handler
|
cmCTestGenericHandler* handler
|
||||||
|
|
|
@ -51,7 +51,8 @@ bool cmAddExecutableCommand::InitialPass(std::vector<std::string> const& args)
|
||||||
|
|
||||||
if (s == args.end())
|
if (s == args.end())
|
||||||
{
|
{
|
||||||
this->SetError("called with incorrect number of arguments, no sources provided");
|
this->SetError
|
||||||
|
("called with incorrect number of arguments, no sources provided");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,8 @@
|
||||||
#include "cmAddSubDirectoryCommand.h"
|
#include "cmAddSubDirectoryCommand.h"
|
||||||
|
|
||||||
// cmAddSubDirectoryCommand
|
// cmAddSubDirectoryCommand
|
||||||
bool cmAddSubDirectoryCommand::InitialPass(std::vector<std::string> const& args)
|
bool cmAddSubDirectoryCommand::InitialPass
|
||||||
|
(std::vector<std::string> const& args)
|
||||||
{
|
{
|
||||||
if(args.size() < 1 )
|
if(args.size() < 1 )
|
||||||
{
|
{
|
||||||
|
@ -103,7 +104,11 @@ bool cmAddSubDirectoryCommand::InitialPass(std::vector<std::string> const& args)
|
||||||
if (!cmSystemTools::FindLastString(binPath.c_str(),
|
if (!cmSystemTools::FindLastString(binPath.c_str(),
|
||||||
this->Makefile->GetHomeDirectory()))
|
this->Makefile->GetHomeDirectory()))
|
||||||
{
|
{
|
||||||
this->SetError("A full source directory was specified that is not in the source tree but no binary directory was specified. If you specify an out of tree source directory then you must provide the binary directory as well.");
|
this->SetError("A full source directory was specified that is not "
|
||||||
|
"in the source tree but no binary directory was "
|
||||||
|
"specified. If you specify an out of tree source "
|
||||||
|
"directory then you must provide the binary "
|
||||||
|
"directory as well.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
cmSystemTools::ReplaceString(binPath,this->Makefile->GetHomeDirectory(),
|
cmSystemTools::ReplaceString(binPath,this->Makefile->GetHomeDirectory(),
|
||||||
|
|
|
@ -22,10 +22,9 @@
|
||||||
// cmExecutableCommand
|
// cmExecutableCommand
|
||||||
bool cmAddTestCommand::InitialPass(std::vector<std::string> const& args)
|
bool cmAddTestCommand::InitialPass(std::vector<std::string> const& args)
|
||||||
{
|
{
|
||||||
// First argument is the name of the test
|
// First argument is the name of the test Second argument is the name of
|
||||||
// Second argument is the name of the executable to run (a target or external
|
// the executable to run (a target or external program) Remaining arguments
|
||||||
// program)
|
// are the arguments to pass to the executable
|
||||||
// Remaining arguments are the arguments to pass to the executable
|
|
||||||
if(args.size() < 2 )
|
if(args.size() < 2 )
|
||||||
{
|
{
|
||||||
this->SetError("called with incorrect number of arguments");
|
this->SetError("called with incorrect number of arguments");
|
||||||
|
|
|
@ -20,7 +20,8 @@
|
||||||
#include <cmsys/Directory.hxx>
|
#include <cmsys/Directory.hxx>
|
||||||
|
|
||||||
// cmAuxSourceDirectoryCommand
|
// cmAuxSourceDirectoryCommand
|
||||||
bool cmAuxSourceDirectoryCommand::InitialPass(std::vector<std::string> const& args)
|
bool cmAuxSourceDirectoryCommand::InitialPass
|
||||||
|
(std::vector<std::string> const& args)
|
||||||
{
|
{
|
||||||
if(args.size() < 2 || args.size() > 2)
|
if(args.size() < 2 || args.size() > 2)
|
||||||
{
|
{
|
||||||
|
@ -68,7 +69,8 @@ bool cmAuxSourceDirectoryCommand::InitialPass(std::vector<std::string> const& ar
|
||||||
// add the file as a class file so
|
// add the file as a class file so
|
||||||
// depends can be done
|
// depends can be done
|
||||||
cmSourceFile cmfile;
|
cmSourceFile cmfile;
|
||||||
cmfile.SetName(fullname.c_str(), this->Makefile->GetCurrentDirectory(),
|
cmfile.SetName(fullname.c_str(),
|
||||||
|
this->Makefile->GetCurrentDirectory(),
|
||||||
this->Makefile->GetSourceExtensions(),
|
this->Makefile->GetSourceExtensions(),
|
||||||
this->Makefile->GetHeaderExtensions());
|
this->Makefile->GetHeaderExtensions());
|
||||||
cmfile.SetProperty("ABSTRACT","0");
|
cmfile.SetProperty("ABSTRACT","0");
|
||||||
|
|
Loading…
Reference in New Issue