diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-09 14:28:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-09 14:28:33 (GMT) |
| commit | 9af1f985fd9d7ec9ee9e6c97af621e59f0fe1e95 (patch) | |
| tree | 97ff380604fbaad05bf5a53530fd03bfea9b09f2 /Source | |
| parent | 2649d794709bb478dd1ce762e251acc7348c6642 (diff) | |
| parent | 887532f0f097fc90f481174ba7cfa08bde9d9195 (diff) | |
| download | CMake-9af1f985fd9d7ec9ee9e6c97af621e59f0fe1e95.zip CMake-9af1f985fd9d7ec9ee9e6c97af621e59f0fe1e95.tar.gz CMake-9af1f985fd9d7ec9ee9e6c97af621e59f0fe1e95.tar.bz2 | |
Merge topic 'fix-ctest-label-regex'
887532f0 CTest: Fix combined inclusive/exclusive label regular expressions
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 1d1dde4..f21d166 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -509,7 +509,7 @@ int cmCTestTestHandler::ProcessHandler() if ( val ) { this->UseExcludeLabelRegExpFlag = true; - this->ExcludeLabelRegularExpression = val; + this->ExcludeLabelRegExp = val; } val = this->GetOption("IncludeRegularExpression"); if ( val ) @@ -1558,7 +1558,7 @@ void cmCTestTestHandler::GetListOfTests() this->IncludeLabelRegularExpression. compile(this->IncludeLabelRegExp.c_str()); } - if ( !this->IncludeLabelRegExp.empty() ) + if ( !this->ExcludeLabelRegExp.empty() ) { this->ExcludeLabelRegularExpression. compile(this->ExcludeLabelRegExp.c_str()); |