From bd80ad89a127e8ce1bbca074f98f90974fb08ab5 Mon Sep 17 00:00:00 2001 From: Victor Gomes Date: Wed, 23 Jun 2021 20:32:31 +0200 Subject: [PATCH] [macros] Upstream Google3 changes - Disables FRIEND_TEST - Removes gtest_prod.h dependency Change-Id: I614f633749f3197989ac4a0d9d5faa6ec03ed59d Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2982481 Reviewed-by: Igor Sheludko Reviewed-by: Michael Achenbach Commit-Queue: Victor Gomes Cr-Commit-Position: refs/heads/master@{#75372} --- src/base/macros.h | 5 +++++ testing/gtest/include/gtest/gtest_prod.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/base/macros.h b/src/base/macros.h index a1880cf784..fca0b2ebb2 100644 --- a/src/base/macros.h +++ b/src/base/macros.h @@ -422,4 +422,9 @@ bool is_inbounds(float_t v) { #define IF_TSAN(V, ...) #endif // V8_ENABLE_WEBASSEMBLY +#ifdef GOOGLE3 +// Disable FRIEND_TEST macro in Google3. +#define FRIEND_TEST(test_case_name, test_name) +#endif + #endif // V8_BASE_MACROS_H_ diff --git a/testing/gtest/include/gtest/gtest_prod.h b/testing/gtest/include/gtest/gtest_prod.h index b6f81aa76b..218e67650c 100644 --- a/testing/gtest/include/gtest/gtest_prod.h +++ b/testing/gtest/include/gtest/gtest_prod.h @@ -7,4 +7,6 @@ // and testing/gmock, instead of directly including files in // third_party/googletest. +#if !defined(GOOGLE3) #include "third_party/googletest/src/googletest/include/gtest/gtest_prod.h" +#endif \ No newline at end of file