diff --git a/third_party/googletest/googlemock/include/gmock/gmock.h b/third_party/googletest/googlemock/include/gmock/gmock.h --- a/third_party/googletest/googlemock/include/gmock/gmock.h +++ b/third_party/googletest/googlemock/include/gmock/gmock.h @@ -58,10 +58,11 @@ #include "gmock/gmock-function-mocker.h" // IWYU pragma: export #include "gmock/gmock-matchers.h" // IWYU pragma: export #include "gmock/gmock-more-actions.h" // IWYU pragma: export #include "gmock/gmock-more-matchers.h" // IWYU pragma: export #include "gmock/gmock-nice-strict.h" // IWYU pragma: export +#include "gmock/gmock-spec-builders.h" // IWYU pragma: export #include "gmock/internal/gmock-internal-utils.h" #include "gmock/internal/gmock-port.h" // Declares Google Mock flags that we want a user to use programmatically. GMOCK_DECLARE_bool_(catch_leaked_mocks); diff --git a/third_party/googletest/googletest/include/gtest/gtest.h b/third_party/googletest/googletest/include/gtest/gtest.h --- a/third_party/googletest/googletest/include/gtest/gtest.h +++ b/third_party/googletest/googletest/include/gtest/gtest.h @@ -71,12 +71,10 @@ #include "gtest/gtest_pred_impl.h" #include "gtest/gtest_prod.h" #include "gtest/internal/gtest-internal.h" #include "gtest/internal/gtest-string.h" -#include "mozilla/Attributes.h" - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4251 \ /* class A needs to have dll-interface to be used by clients of class B */) // Declares the flags. @@ -325,11 +323,11 @@ // // A sub-class must implement this to define the test logic. // // DO NOT OVERRIDE THIS FUNCTION DIRECTLY IN A USER PROGRAM. // Instead, use the TEST or TEST_F macro. - MOZ_CAN_RUN_SCRIPT virtual void TestBody() = 0; + virtual void TestBody() = 0; // Sets up, executes, and tears down the test. void Run(); // Deletes self. We deliberately pick an unusual name for this diff --git a/third_party/googletest/googletest/src/gtest.cc b/third_party/googletest/googletest/src/gtest.cc --- a/third_party/googletest/googletest/src/gtest.cc +++ b/third_party/googletest/googletest/src/gtest.cc @@ -41,10 +41,11 @@ #include #include #include // NOLINT #include +#include // NOLINT: raise(3) is used on some platforms #include #include #include #include #include diff --git a/third_party/googletest/moz.yaml b/third_party/googletest/moz.yaml --- a/third_party/googletest/moz.yaml +++ b/third_party/googletest/moz.yaml @@ -8,13 +8,13 @@ name: googletest description: Google Testing and Mocking Framework url: https://google.github.io/googletest/ - release: 518387203b573f35477fa6872dd54620e70d2bdb (2023-10-23T17:11:36Z). + release: b10fad38c4026a29ea6561ab15fc4818170d1c10 (2023-10-30T21:33:13Z). - revision: 518387203b573f35477fa6872dd54620e70d2bdb + revision: b10fad38c4026a29ea6561ab15fc4818170d1c10 license: BSD-3-Clause license-file: LICENSE vendoring: