6a7eae7184
This commit fixes cmCTestRunTest and cmProcess to more efficiently handle child output. We now use the buffer for each child output pipe to hold at most a partial line plus one new block of data at a time. All complete lines are scanned in-place, and then only the partial line at the end of the buffer is moved back to the beginning before appending new data. We also simplify the cmProcess interface by making GetNextOutputLine the only method that needs to be called while the process is running. This simplifies cmCTestRunTest so that CheckOutput can be called until it returns false when the process is done.
106 lines
3.1 KiB
C++
106 lines
3.1 KiB
C++
/*=========================================================================
|
|
|
|
Program: CMake - Cross-Platform Makefile Generator
|
|
Module: $RCSfile$
|
|
Language: C++
|
|
Date: $Date$
|
|
Version: $Revision$
|
|
|
|
Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
|
|
See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
|
|
|
|
This software is distributed WITHOUT ANY WARRANTY; without even
|
|
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
PURPOSE. See the above copyright notices for more information.
|
|
|
|
=========================================================================*/
|
|
#ifndef cmCTestRunTest_h
|
|
#define cmCTestRunTest_h
|
|
|
|
#include <cmStandardIncludes.h>
|
|
#include <cmCTestTestHandler.h>
|
|
#include <cmProcess.h>
|
|
|
|
/** \class cmRunTest
|
|
* \brief represents a single test to be run
|
|
*
|
|
* cmRunTest contains the information related to running a single test
|
|
*/
|
|
class cmCTestRunTest
|
|
{
|
|
public:
|
|
cmCTestRunTest(cmCTestTestHandler* handler);
|
|
~cmCTestRunTest();
|
|
|
|
void SetTestProperties(cmCTestTestHandler::cmCTestTestProperties * prop)
|
|
{ this->TestProperties = prop; }
|
|
|
|
cmCTestTestHandler::cmCTestTestProperties * GetTestProperties()
|
|
{ return this->TestProperties; }
|
|
|
|
void SetIndex(int i) { this->Index = i; }
|
|
|
|
int GetIndex() { return this->Index; }
|
|
|
|
std::string GetProcessOutput() { return this->ProcessOutput; }
|
|
|
|
cmCTestTestHandler::cmCTestTestResult GetTestResults()
|
|
{ return this->TestResult; }
|
|
|
|
// Read and store output. Returns true if it must be called again.
|
|
bool CheckOutput();
|
|
|
|
//launch the test process, return whether it started correctly
|
|
bool StartTest();
|
|
//capture and report the test results
|
|
bool EndTest(size_t completed, size_t total, bool started);
|
|
//Called by ctest -N to log the command string
|
|
void ComputeArguments();
|
|
private:
|
|
void DartProcessing();
|
|
bool CreateProcess(double testTimeOut,
|
|
std::vector<std::string>* environment);
|
|
void WriteLogOutputTop(size_t completed, size_t total);
|
|
//Run post processing of the process output for MemCheck
|
|
void MemCheckPostProcess();
|
|
|
|
cmCTestTestHandler::cmCTestTestProperties * TestProperties;
|
|
//Pointer back to the "parent"; the handler that invoked this test run
|
|
cmCTestTestHandler * TestHandler;
|
|
cmCTest * CTest;
|
|
cmProcess * TestProcess;
|
|
//If the executable to run is ctest, don't create a new process;
|
|
//just instantiate a new cmTest. (Can be disabled for a single test
|
|
//if this option is set to false.)
|
|
//bool OptimizeForCTest;
|
|
|
|
//flag for whether the env was modified for this run
|
|
bool ModifyEnv;
|
|
//stores the original environment if we are modifying it
|
|
std::vector<std::string> OrigEnv;
|
|
std::string ProcessOutput;
|
|
//The test results
|
|
cmCTestTestHandler::cmCTestTestResult TestResult;
|
|
int Index;
|
|
std::string StartTime;
|
|
std::string TestCommand;
|
|
std::string ActualCommand;
|
|
std::vector<std::string> Arguments;
|
|
};
|
|
|
|
inline int getNumWidth(size_t n)
|
|
{
|
|
int numWidth = 1;
|
|
if(n >= 10)
|
|
{
|
|
numWidth = 2;
|
|
}
|
|
if(n >= 100)
|
|
{
|
|
numWidth = 3;
|
|
}
|
|
return numWidth;
|
|
}
|
|
#endif
|
|
|