diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-03-11 12:41:39 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-03-11 12:41:39 +0100 |
commit | 7f0618b9554987897c7a4773976f03cdbb07b259 (patch) | |
tree | 06310b1954cc56e70d4a48c23a283e14f9c97fbb /vespalib | |
parent | 48ce50681ad29a1a17446dbb1f0413615ca35725 (diff) |
Use std::basic_regex in vespalib testkit.
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/vespa/vespalib/testkit/test_hook.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vespalib/src/vespa/vespalib/testkit/test_hook.cpp b/vespalib/src/vespa/vespalib/testkit/test_hook.cpp index e9be9268272..2babd22842b 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_hook.cpp +++ b/vespalib/src/vespa/vespalib/testkit/test_hook.cpp @@ -2,7 +2,7 @@ #include "test_hook.h" #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/vespalib/util/regexp.h> +#include <regex> #include <vespa/fastos/thread.h> namespace vespalib { @@ -98,13 +98,13 @@ TestHook::runAll() FastOSTestThreadFactory threadFactory; TestThreadFactory::factory = &threadFactory; std::string name = TestMaster::master.getName(); - Regexp pattern(lookup_subset_pattern(name)); + std::basic_regex pattern(lookup_subset_pattern(name), std::regex::extended); size_t testsPassed = 0; size_t testsFailed = 0; size_t testsIgnored = 0; size_t testsSkipped = 0; for (TestHook *test = _head; test != 0; test = test->_next) { - if (pattern.match(test->_tag)) { + if (std::regex_search(test->_tag, pattern)) { bool ignored = test->_ignore; bool failed = !test->run(); if (ignored) { |