Commit 38491644 authored by Daniel Pfeifer's avatar Daniel Pfeifer Committed by Brad King
Browse files

CTest: fix include-what-you-use violations

parent 81c3e637
......@@ -12,12 +12,18 @@
#include "cmCTestBZR.h"
#include "cmCTest.h"
#include "cmCTestVC.h"
#include "cmProcessTools.h"
#include "cmSystemTools.h"
#include "cmXMLParser.h"
#include <cmsys/RegularExpression.hxx>
#include <cm_expat.h>
#include <cmsys/RegularExpression.hxx>
#include <list>
#include <map>
#include <ostream>
#include <stdlib.h>
#include <vector>
extern "C" int cmBZRXMLParserUnknownEncodingHandler(void* /*unused*/,
const XML_Char* name,
......
......@@ -12,8 +12,15 @@
#ifndef cmCTestBZR_h
#define cmCTestBZR_h
#include <cmConfigure.h>
#include "cmCTestGlobalVC.h"
#include <iosfwd>
#include <string>
class cmCTest;
/** \class cmCTestBZR
* \brief Interaction with bzr command-line tool
*
......@@ -41,13 +48,14 @@ private:
// Parsing helper classes.
class InfoParser;
class RevnoParser;
class LogParser;
class UpdateParser;
class RevnoParser;
class StatusParser;
class UpdateParser;
friend class InfoParser;
friend class RevnoParser;
friend class LogParser;
friend class RevnoParser;
friend class UpdateParser;
friend class StatusParser;
};
......
......@@ -13,10 +13,14 @@
#include "cmCTestBatchTestHandler.h"
#include "cmCTest.h"
#include "cmCTestMultiProcessHandler.h"
#include "cmCTestTestHandler.h"
#include "cmProcess.h"
#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include <stdlib.h>
#include <map>
#include <utility>
#include <vector>
cmCTestBatchTestHandler::~cmCTestBatchTestHandler()
{
......
......@@ -13,12 +13,11 @@
#ifndef cmCTestBatchTestHandler_h
#define cmCTestBatchTestHandler_h
#include <cmStandardIncludes.h>
#include <cmConfigure.h>
#include <cmCTestMultiProcessHandler.h>
#include <cmCTestRunTest.h>
#include <cmCTestTestHandler.h>
#include <cmsys/FStream.hxx>
#include <string>
/** \class cmCTestBatchTestHandler
* \brief run parallel ctest
......
......@@ -17,7 +17,9 @@
#include "cmGlobalGenerator.h"
#include "cmSystemTools.h"
#include "cmake.h"
#include <cmsys/Process.h>
#include <stdlib.h>
cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler()
{
......
......@@ -13,8 +13,15 @@
#ifndef cmCTestBuildAndTestHandler_h
#define cmCTestBuildAndTestHandler_h
#include <cmConfigure.h>
#include "cmCTestGenericHandler.h"
#include "cmListFileCache.h"
#include "cmTypeMacro.h"
#include <sstream>
#include <stddef.h>
#include <string>
#include <vector>
class cmake;
......
......@@ -15,8 +15,15 @@
#include "cmCTestBuildHandler.h"
#include "cmCTestGenericHandler.h"
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
#include "cmake.h"
#include <sstream>
#include <string.h>
class cmExecutionStatus;
cmCTestBuildCommand::cmCTestBuildCommand()
{
this->GlobalGenerator = CM_NULLPTR;
......
......@@ -12,10 +12,19 @@
#ifndef cmCTestBuildCommand_h
#define cmCTestBuildCommand_h
#include <cmConfigure.h>
#include "cmCTestHandlerCommand.h"
#include "cmTypeMacro.h"
#include <string>
#include <vector>
class cmGlobalGenerator;
class cmCTestBuildHandler;
class cmCTestGenericHandler;
class cmCommand;
class cmExecutionStatus;
class cmGlobalGenerator;
/** \class cmCTestBuild
* \brief Run a ctest script
......
......@@ -16,25 +16,16 @@
#include "cmCTest.h"
#include "cmFileTimeComparison.h"
#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
#include "cmXMLWriter.h"
#include "cmake.h"
//#include <cmsys/RegularExpression.hxx>
#include <cmsys/Directory.hxx>
#include <cmsys/FStream.hxx>
#include <cmsys/Process.h>
// used for sleep
#ifdef _WIN32
#include "windows.h"
#endif
#include <float.h>
#include <math.h>
#include <set>
#include <stdlib.h>
#include <time.h>
#include <string.h>
static const char* cmCTestErrorMatches[] = {
"^[Bb]us [Ee]rror",
......
......@@ -13,13 +13,17 @@
#ifndef cmCTestBuildHandler_h
#define cmCTestBuildHandler_h
#include "cmCTestGenericHandler.h"
#include <cmConfigure.h>
#include "cmListFileCache.h"
#include "cmCTestGenericHandler.h"
#include "cmTypeMacro.h"
#include <cmsys/RegularExpression.hxx>
#include <deque>
#include <iosfwd>
#include <stddef.h>
#include <string>
#include <vector>
class cmMakefile;
class cmXMLWriter;
......@@ -148,6 +152,7 @@ private:
bool UseCTestLaunch;
std::string CTestLaunchDir;
class LaunchHelper;
friend class LaunchHelper;
class FragmentCompare;
};
......
......@@ -12,11 +12,13 @@
#include "cmCTestCVS.h"
#include "cmCTest.h"
#include "cmProcessTools.h"
#include "cmSystemTools.h"
#include "cmXMLWriter.h"
#include <cmsys/FStream.hxx>
#include <cmsys/RegularExpression.hxx>
#include <utility>
cmCTestCVS::cmCTestCVS(cmCTest* ct, std::ostream& log)
: cmCTestVC(ct, log)
......
......@@ -12,11 +12,18 @@
#ifndef cmCTestCVS_h
#define cmCTestCVS_h
#include <cmConfigure.h>
#include "cmCTestVC.h"
#include <iosfwd>
#include <map>
#include <string>
#include <vector>
class cmCTest;
class cmXMLWriter;
/** \class cmCTestCVS
* \brief Interaction with cvs command-line tool
*
......@@ -47,10 +54,11 @@ private:
Directory const& dir);
// Parsing helper classes.
class UpdateParser;
class LogParser;
friend class UpdateParser;
class UpdateParser;
friend class LogParser;
friend class UpdateParser;
};
#endif
......@@ -14,6 +14,13 @@
#include "cmCTest.h"
#include "cmCTestGenericHandler.h"
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
#include "cmSystemTools.h"
#include "cmake.h"
#include <sstream>
#include <string.h>
#include <vector>
cmCTestConfigureCommand::cmCTestConfigureCommand()
{
......
......@@ -12,7 +12,15 @@
#ifndef cmCTestConfigureCommand_h
#define cmCTestConfigureCommand_h
#include <cmConfigure.h>
#include "cmCTestHandlerCommand.h"
#include "cmTypeMacro.h"
#include <string>
class cmCTestGenericHandler;
class cmCommand;
/** \class cmCTestConfigure
* \brief Run a ctest script
......
......@@ -14,9 +14,11 @@
#include "cmCTest.h"
#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
#include "cmXMLWriter.h"
#include "cmake.h"
#include <cmsys/Process.h>
#include <ostream>
#include <string>
cmCTestConfigureHandler::cmCTestConfigureHandler()
{
......
......@@ -13,9 +13,10 @@
#ifndef cmCTestConfigureHandler_h
#define cmCTestConfigureHandler_h
#include "cmCTestGenericHandler.h"
#include <cmConfigure.h>
#include "cmListFileCache.h"
#include "cmCTestGenericHandler.h"
#include "cmTypeMacro.h"
/** \class cmCTestConfigureHandler
* \brief A class that handles ctest -S invocations
......
......@@ -14,6 +14,8 @@
#include "cmCTest.h"
#include "cmCTestCoverageHandler.h"
class cmCTestGenericHandler;
cmCTestCoverageCommand::cmCTestCoverageCommand()
{
this->LabelsMentioned = false;
......
......@@ -12,7 +12,16 @@
#ifndef cmCTestCoverageCommand_h
#define cmCTestCoverageCommand_h
#include <cmConfigure.h>
#include "cmCTestHandlerCommand.h"
#include "cmTypeMacro.h"
#include <set>
#include <string>
class cmCTestGenericHandler;
class cmCommand;
/** \class cmCTestCoverage
* \brief Run a ctest script
......
......@@ -13,7 +13,6 @@
#include "cmCTest.h"
#include "cmGeneratedFileStream.h"
#include "cmMakefile.h"
#include "cmParseBlanketJSCoverage.h"
#include "cmParseCacheCoverage.h"
#include "cmParseCoberturaCoverage.h"
......@@ -25,14 +24,19 @@
#include "cmXMLWriter.h"
#include "cmake.h"
#include <algorithm>
#include <cmsys/FStream.hxx>
#include <cmsys/Glob.hxx>
#include <cmsys/Process.h>
#include <cmsys/RegularExpression.hxx>
#include <float.h>
#include <math.h>
#include <iomanip>
#include <iterator>
#include <sstream>
#include <stdio.h>
#include <stdlib.h>
#include <utility>
class cmMakefile;
#define SAFEDIV(x, y) (((y) != 0) ? ((x) / (y)) : (0))
......
......@@ -13,14 +13,22 @@
#ifndef cmCTestCoverageHandler_h
#define cmCTestCoverageHandler_h
#include "cmCTestGenericHandler.h"
#include <cmConfigure.h>
#include "cmListFileCache.h"
#include "cmCTestGenericHandler.h"
#include "cmTypeMacro.h"
#include <cmsys/RegularExpression.hxx>
#include <iosfwd>
#include <map>
#include <set>
#include <string>
#include <vector>
class cmGeneratedFileStream;
class cmMakefile;
class cmXMLWriter;
class cmCTestCoverageHandlerContainer
{
public:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment