diff options
| author | David Cole <david.cole@kitware.com> | 2011-08-16 21:02:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-08-16 21:02:23 (GMT) |
| commit | 0923610b6dff07005cdc3915ee0fa1fa8e6a7def (patch) | |
| tree | 3797ee6a87b4fcf900c87619a7d795dfa852ffb3 | |
| parent | e9a943bab2b31bea1f842f54d4a1e7c4aaa053c5 (diff) | |
| parent | 4575ed9e2ace903b29a8b10c7e7f78c4fe6b9d21 (diff) | |
| download | CMake-0923610b6dff07005cdc3915ee0fa1fa8e6a7def.zip CMake-0923610b6dff07005cdc3915ee0fa1fa8e6a7def.tar.gz CMake-0923610b6dff07005cdc3915ee0fa1fa8e6a7def.tar.bz2 | |
Merge topic 'fix-11746-sort-failed-tests-output'
4575ed9 Fix line too long style violation
ba4886b CTest: print failed tests in index order (#11746)
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 11 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.h | 13 |
2 files changed, 19 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index b824e47..9b12393 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -33,6 +33,7 @@ #include <float.h> #include <memory> // auto_ptr +#include <set> //---------------------------------------------------------------------- class cmCTestSubdirCommand : public cmCommand @@ -617,9 +618,13 @@ int cmCTestTestHandler::ProcessHandler() << "The following tests FAILED:" << std::endl); this->StartLogFile("TestsFailed", ofs); - std::vector<cmCTestTestHandler::cmCTestTestResult>::iterator ftit; - for(ftit = this->TestResults.begin(); - ftit != this->TestResults.end(); ++ftit) + typedef std::set<cmCTestTestHandler::cmCTestTestResult, + cmCTestTestResultLess> SetOfTests; + SetOfTests resultsSet(this->TestResults.begin(), + this->TestResults.end()); + + for(SetOfTests::iterator ftit = resultsSet.begin(); + ftit != resultsSet.end(); ++ftit) { if ( ftit->Status != cmCTestTestHandler::COMPLETED ) { diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index 3089d35..8e59e59 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -125,7 +125,16 @@ public: cmCTestTestProperties* Properties; }; - // add configuraitons to a search path for an executable + struct cmCTestTestResultLess + { + bool operator() (const cmCTestTestResult &lhs, + const cmCTestTestResult &rhs) const + { + return lhs.TestCount < rhs.TestCount; + } + }; + + // add configurations to a search path for an executable static void AddConfigurations(cmCTest *ctest, std::vector<std::string> &attempted, std::vector<std::string> &attemptedConfigs, @@ -141,7 +150,7 @@ public: typedef std::vector<cmCTestTestProperties> ListOfTests; protected: - // comput a final test list + // compute a final test list virtual int PreProcessHandler(); virtual int PostProcessHandler(); virtual void GenerateTestCommand(std::vector<std::string>& args); |