Sort include directives within each block (separated by a blank line) in lexicographic order (except to prioritize `sys/types.h` first). First run `clang-format` with the config file: --- SortIncludes: false ... Commit the result temporarily. Then run `clang-format` again with: --- SortIncludes: true IncludeCategories: - Regex: 'sys/types.h' Priority: -1 ... Commit the result temporarily. Start a new branch and cherry-pick the second commit. Manually resolve conflicts to preserve indentation of re-ordered includes. This cleans up the include ordering without changing any other style. Use the following command to run `clang-format`: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '(Lexer|Parser|ParserHelper)\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i This selects source files that do not come from a third-party. Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
145 lines
3.8 KiB
C++
145 lines
3.8 KiB
C++
/*============================================================================
|
|
CMake - Cross Platform Makefile Generator
|
|
Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
|
|
|
|
Distributed under the OSI-approved BSD License (the "License");
|
|
see accompanying file Copyright.txt for details.
|
|
|
|
This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
See the License for more information.
|
|
============================================================================*/
|
|
|
|
#include "cmCTestBatchTestHandler.h"
|
|
|
|
#include "cmCTest.h"
|
|
#include "cmProcess.h"
|
|
#include "cmStandardIncludes.h"
|
|
#include "cmSystemTools.h"
|
|
#include <stdlib.h>
|
|
|
|
cmCTestBatchTestHandler::~cmCTestBatchTestHandler()
|
|
{
|
|
}
|
|
|
|
//---------------------------------------------------------
|
|
void cmCTestBatchTestHandler::RunTests()
|
|
{
|
|
this->WriteBatchScript();
|
|
this->SubmitBatchScript();
|
|
}
|
|
|
|
//---------------------------------------------------------
|
|
void cmCTestBatchTestHandler::WriteBatchScript()
|
|
{
|
|
this->Script = this->CTest->GetBinaryDir()
|
|
+ "/Testing/CTestBatch.txt";
|
|
cmsys::ofstream fout;
|
|
fout.open(this->Script.c_str());
|
|
fout << "#!/bin/sh\n";
|
|
|
|
for(TestMap::iterator i = this->Tests.begin(); i != this->Tests.end(); ++i)
|
|
{
|
|
this->WriteSrunArgs(i->first, fout);
|
|
this->WriteTestCommand(i->first, fout);
|
|
fout << "\n";
|
|
}
|
|
fout.flush();
|
|
fout.close();
|
|
}
|
|
|
|
//---------------------------------------------------------
|
|
void cmCTestBatchTestHandler::WriteSrunArgs(int test, cmsys::ofstream& fout)
|
|
{
|
|
cmCTestTestHandler::cmCTestTestProperties* properties =
|
|
this->Properties[test];
|
|
|
|
fout << "srun ";
|
|
//fout << "--jobid=" << test << " ";
|
|
fout << "-J=" << properties->Name << " ";
|
|
|
|
//Write dependency information
|
|
/*if(!this->Tests[test].empty())
|
|
{
|
|
fout << "-P=afterany";
|
|
for(TestSet::iterator i = this->Tests[test].begin();
|
|
i != this->Tests[test].end(); ++i)
|
|
{
|
|
fout << ":" << *i;
|
|
}
|
|
fout << " ";
|
|
}*/
|
|
if(properties->RunSerial)
|
|
{
|
|
fout << "--exclusive ";
|
|
}
|
|
if(properties->Processors > 1)
|
|
{
|
|
fout << "-n" << properties->Processors << " ";
|
|
}
|
|
}
|
|
|
|
//---------------------------------------------------------
|
|
void cmCTestBatchTestHandler::WriteTestCommand(int test, cmsys::ofstream& fout)
|
|
{
|
|
std::vector<std::string> args = this->Properties[test]->Args;
|
|
std::vector<std::string> processArgs;
|
|
std::string command;
|
|
|
|
command = this->TestHandler->FindTheExecutable(args[1].c_str());
|
|
command = cmSystemTools::ConvertToOutputPath(command.c_str());
|
|
|
|
//Prepends memcheck args to our command string if this is a memcheck
|
|
this->TestHandler->GenerateTestCommand(processArgs, test);
|
|
processArgs.push_back(command);
|
|
|
|
for(std::vector<std::string>::iterator arg = processArgs.begin();
|
|
arg != processArgs.end(); ++arg)
|
|
{
|
|
fout << *arg << " ";
|
|
}
|
|
|
|
std::vector<std::string>::iterator i = args.begin();
|
|
++i; //the test name
|
|
++i; //the executable (command)
|
|
if(args.size() > 2)
|
|
{
|
|
fout << "'";
|
|
}
|
|
while(i != args.end())
|
|
{
|
|
fout << "\"" << *i << "\""; //args to the test executable
|
|
++i;
|
|
|
|
if(i == args.end() && args.size() > 2)
|
|
{
|
|
fout << "'";
|
|
}
|
|
fout << " ";
|
|
}
|
|
//TODO ZACH build TestResult.FullCommandLine
|
|
//this->TestResult.FullCommandLine = this->TestCommand;
|
|
}
|
|
|
|
//---------------------------------------------------------
|
|
void cmCTestBatchTestHandler::SubmitBatchScript()
|
|
{
|
|
cmProcess sbatch;
|
|
std::vector<std::string> args;
|
|
args.push_back(this->Script);
|
|
args.push_back("-o");
|
|
args.push_back(this->CTest->GetBinaryDir()
|
|
+ "/Testing/CTestBatch.txt");
|
|
|
|
sbatch.SetCommand("sbatch");
|
|
sbatch.SetCommandArguments(args);
|
|
/*if(sbatch.StartProcess())
|
|
{
|
|
//success condition
|
|
}
|
|
else
|
|
{
|
|
//fail condition
|
|
}*/
|
|
}
|