diff options
| author | David Benjamin <davidben@google.com> | 2023-09-01 21:23:01 -0400 |
|---|---|---|
| committer | Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-09-05 21:11:19 +0000 |
| commit | fa343af32b77f5f005a651656732ae3f0b526774 (patch) | |
| tree | d477a6527b92aa2fc074a263493581670dcd0df7 /CMakeLists.txt | |
| parent | db1e9877fdabaf88494e2314cd527f09d5790281 (diff) | |
| download | boringssl-fa343af32b77f5f005a651656732ae3f0b526774.zip boringssl-fa343af32b77f5f005a651656732ae3f0b526774.tar.gz boringssl-fa343af32b77f5f005a651656732ae3f0b526774.tar.bz2 | |
Update googletest and include googlemock
Some tests in the Chromium verifier use gmock. Since upstream googletest
considers them a single project now, just import both of them.
Update-Note: As part of this, I've made gtest_main.cc now initializes
gmock alongside gtest. This means BoringSSL's test targets now depend on
both. Downstream builds where googletest and googlemock are separate
build targets may need to add a dependency. (Though every downstream
test I looked at treats them as one target, so this is most likely a
no-op.)
Bug: chromium:1322914
Change-Id: Ief38c675bc13a4639dee061d058580967ab99d41
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/62945
Commit-Queue: Bob Beck <bbe@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 78f9b59..7cf93b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -478,14 +478,22 @@ endif() # Add minimal googletest targets. The provided one has many side-effects, and # googletest has a very straightforward build. -add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc) +add_library( + boringssl_gtest + third_party/googletest/googlemock/src/gmock-all.cc + third_party/googletest/googletest/src/gtest-all.cc +) if(USE_CUSTOM_LIBCXX) target_link_libraries(boringssl_gtest libcxx) endif() target_include_directories( boringssl_gtest - PUBLIC third_party/googletest/include - PRIVATE third_party/googletest + PUBLIC + third_party/googletest/googlemock/include + third_party/googletest/googletest/include + PRIVATE + third_party/googletest/googlemock + third_party/googletest/googletest ) # Declare a dummy target to build all unit tests. Test targets should inject |