diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-04-09 11:45:18 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-04-09 11:45:18 (GMT) |
| commit | 55c0ff5f649e4cafdae1d50472ab1d976cc80120 (patch) | |
| tree | c120d05ce27fd9b826053d887cfcfcfd3a520491 /Source/CTest | |
| parent | 2238e2269943e7ea20857fb13dcf0b679e0daf23 (diff) | |
| download | CMake-55c0ff5f649e4cafdae1d50472ab1d976cc80120.zip CMake-55c0ff5f649e4cafdae1d50472ab1d976cc80120.tar.gz CMake-55c0ff5f649e4cafdae1d50472ab1d976cc80120.tar.bz2 | |
BUG: Improve the behavior of the ReadCustomFilesCommand
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 5 | ||||
| -rw-r--r-- | Source/CTest/cmCTestReadCustomFilesCommand.cxx | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index e1011da..abd8ddd 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -311,6 +311,7 @@ int cmCTestBuildHandler::ProcessHandler() { this->CustomWarningMatches.push_back(cmCTestWarningMatches[cc]); } + for ( cc = 0; cmCTestWarningExceptions[cc]; cc ++ ) { this->CustomWarningExceptions.push_back(cmCTestWarningExceptions[cc]); @@ -321,8 +322,12 @@ int cmCTestBuildHandler::ProcessHandler() #define cmCTestBuildHandlerPopulateRegexVector(strings, regexes) \ regexes.clear(); \ + cmCTestLog(this->CTest, DEBUG, this << "Add " #regexes \ + << std::endl); \ for ( it = strings.begin(); it != strings.end(); ++it ) \ { \ + cmCTestLog(this->CTest, DEBUG, "Add " #strings ": " \ + << it->c_str() << std::endl); \ regexes.push_back(it->c_str()); \ } cmCTestBuildHandlerPopulateRegexVector( diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.cxx b/Source/CTest/cmCTestReadCustomFilesCommand.cxx index a381095..88d9b87 100644 --- a/Source/CTest/cmCTestReadCustomFilesCommand.cxx +++ b/Source/CTest/cmCTestReadCustomFilesCommand.cxx @@ -9,8 +9,8 @@ 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 + 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. =========================================================================*/ @@ -30,9 +30,10 @@ bool cmCTestReadCustomFilesCommand::InitialPass( std::vector<std::string>::const_iterator dit; for ( dit = args.begin(); dit != args.end(); ++ dit ) { - this->CTest->ReadCustomConfigurationFileTree(dit->c_str()); + this->CTest->ReadCustomConfigurationFileTree(dit->c_str(), + this->Makefile); } - + return true; } |