diff options
author | Geir Storli <geirst@verizonmedia.com> | 2019-03-26 15:08:40 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-26 15:08:40 +0100 |
commit | 1e2a55fbaae5779f8cc0f2938087484c7478d212 (patch) | |
tree | 16c54b9d0a7560776b57afddd425cd2f2eef692d | |
parent | 03dfdd7d40ac453e7650abc45cb1aa5c9f0f515d (diff) | |
parent | 8e42de2a8aae4b90ae5a20651f5ff8ab7674142d (diff) |
Merge pull request #8911 from vespa-engine/toregge/use-std-basic-regex-in-searchcore
Use std::basic_regex in searchcore module.
-rw-r--r-- | searchcore/src/tests/proton/docsummary/docsummary.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index fb8674b5255..a3acbfdbfe0 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -34,6 +34,7 @@ #include <vespa/vespalib/encoding/base64.h> #include <vespa/config-bucketspaces.h> #include <vespa/vespalib/testkit/testapp.h> +#include <regex> #include <vespa/log/log.h> LOG_SETUP("docsummary_test"); @@ -655,7 +656,8 @@ Test::requireThatSummariesTimeout() vespalib::SimpleBuffer buf; vespalib::Slime summary = getSlime(*rep, 0, false); JsonFormat::encode(summary, buf, false); - EXPECT_TRUE(vespalib::Regexp("Timed out with -[0-9]+us left.").match(buf.get().make_stringref())); + auto bufstring = buf.get().make_stringref(); + EXPECT_TRUE(std::regex_search(bufstring.data(), bufstring.data() + bufstring.size(), std::basic_regex<char>("Timed out with -[0-9]+us left."))); } void |