diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2020-06-24 22:43:58 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-07-14 19:26:35 +0000 |
| commit | 316408d14e2358225e8f26bfe4d4022cfcf748d9 (patch) | |
| tree | 602d5a1a11730e526b9a6ae81c5000aba09cdb48 | |
| parent | eb6dc1da7ce35cf005b20c2933108341f7dee1a7 (diff) | |
| download | mongo-316408d14e2358225e8f26bfe4d4022cfcf748d9.tar.gz | |
SERVER-49074 make pcrecpp LIBDEPS_PRIVATE to unittest
| -rw-r--r-- | src/mongo/unittest/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/unittest/unittest.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/unittest/unittest.h | 4 | ||||
| -rw-r--r-- | src/mongo/util/SConscript | 7 |
4 files changed, 13 insertions, 5 deletions
diff --git a/src/mongo/unittest/SConscript b/src/mongo/unittest/SConscript index f0eb8f5e9d5..53fbc823456 100644 --- a/src/mongo/unittest/SConscript +++ b/src/mongo/unittest/SConscript @@ -17,11 +17,11 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', - '$BUILD_DIR/third_party/shim_pcrecpp', ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/util/options_parser/options_parser', + '$BUILD_DIR/third_party/shim_pcrecpp', ], ) diff --git a/src/mongo/unittest/unittest.cpp b/src/mongo/unittest/unittest.cpp index 2678d8d5a1f..c3d0431b8d9 100644 --- a/src/mongo/unittest/unittest.cpp +++ b/src/mongo/unittest/unittest.cpp @@ -40,6 +40,7 @@ #include <iostream> #include <map> #include <memory> +#include <pcrecpp.h> #include "mongo/logger/console_appender.h" #include "mongo/logger/log_manager.h" @@ -80,6 +81,10 @@ auto& suitesMap() { } // namespace +bool searchRegex(const std::string& pattern, const std::string& string) { + return pcrecpp::RE(pattern).PartialMatch(string); +} + class Result { public: struct FailStatus { diff --git a/src/mongo/unittest/unittest.h b/src/mongo/unittest/unittest.h index f07f159fc74..be634883635 100644 --- a/src/mongo/unittest/unittest.h +++ b/src/mongo/unittest/unittest.h @@ -280,7 +280,7 @@ #define ASSERT_STRING_SEARCH_REGEX(BIG_STRING, REGEX) \ if (auto tup_ = std::tuple(std::string(BIG_STRING), std::string(REGEX)); \ - pcrecpp::RE(std::get<1>(tup_)).PartialMatch(std::get<0>(tup_))) { \ + ::mongo::unittest::searchRegex(std::get<1>(tup_), std::get<0>(tup_))) { \ } else \ FAIL(([&] { \ const auto& [haystack, sub] = tup_; \ @@ -345,6 +345,8 @@ namespace mongo::unittest { +bool searchRegex(const std::string& pattern, const std::string& string); + class Result; /** diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript index eba697882d5..9eefac553ea 100644 --- a/src/mongo/util/SConscript +++ b/src/mongo/util/SConscript @@ -658,7 +658,7 @@ if use_libunwind: # you must add new libdeps here, or for the similar cases # below, do it as follows: # - # LIBDEPS=(stacktraceEnv['LIBDEPS'] + [ + # LIBDEPS=(stacktraceEnv.get('LIBDEPS', []) + [ # some_new_libdep, # another_new_libdep, # ]), @@ -671,8 +671,9 @@ if use_libunwind: stacktraceEnv.CppUnitTest( target='stacktrace_test', source='stacktrace_test.cpp', - # See above for how to handle any future LIBDEPS additions here. - # LIBDEPS=... + LIBDEPS=(stacktraceEnv.get('LIBDEPS', []) + [ + '$BUILD_DIR/third_party/shim_pcrecpp' + ]), ) stacktraceEnv.Benchmark( |