summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2013-05-11 10:14:37 (GMT)
committerRolf Eike Beer <eike@sf-mail.de>2013-05-11 10:15:38 (GMT)
commit12cf7bc507e914c48289b73d241c5c9fea091ce8 (patch)
tree693b1af0d29e2fd29bef800d9524c02967bea9a0
parent1c575ab72f7eabfc98c78dfa8fa3ce1b32b3c157 (diff)
downloadCMake-12cf7bc507e914c48289b73d241c5c9fea091ce8.zip
CMake-12cf7bc507e914c48289b73d241c5c9fea091ce8.tar.gz
CMake-12cf7bc507e914c48289b73d241c5c9fea091ce8.tar.bz2
CTest: break after first regex match on output
PASS_REGULAR_EXPRESSION and FAIL_REGULAR_EXPRESSION both take a list of expressions. Stop searching if the first of those has matched the output as the result will not change anymore.
-rw-r--r--Source/CTest/cmCTestRunTest.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 5eabf3f..fc1bcb5 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -166,6 +166,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
{
found = true;
reason = "Required regular expression found.";
+ break;
}
}
if ( !found )
@@ -196,6 +197,7 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t total, bool started)
reason += passIt->second;
reason += "]";
forceFail = true;
+ break;
}
}
}