Commit b9712c6b authored by Fabrice de Gans-Riberi's avatar Fabrice de Gans-Riberi Committed by Commit Bot

Remove GTEST_HAS_COMBINE

This was removed from gtest and	is necessary to	roll gtest in
Chromium.

TBR=adamk@chromium.org

Bug: chromium:893369
Change-Id: I21762aa65ab2fc3f52731e7e812f0bf155f285e6
Reviewed-on: https://chromium-review.googlesource.com/c/1310598
Commit-Queue: Fabrice de Gans-Riberi <fdegans@chromium.org>
Reviewed-by: 's avatarAdam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#57193}
parent 2e3ba516
...@@ -13,8 +13,6 @@ namespace internal { ...@@ -13,8 +13,6 @@ namespace internal {
namespace compiler { namespace compiler {
namespace machine_operator_unittest { namespace machine_operator_unittest {
#if GTEST_HAS_COMBINE
template <typename T> template <typename T>
class MachineOperatorTestWithParam class MachineOperatorTestWithParam
: public TestWithZone, : public TestWithZone,
...@@ -159,7 +157,6 @@ INSTANTIATE_TEST_CASE_P( ...@@ -159,7 +157,6 @@ INSTANTIATE_TEST_CASE_P(
::testing::Combine(::testing::ValuesIn(kRepresentationsForStore), ::testing::Combine(::testing::ValuesIn(kRepresentationsForStore),
::testing::Values(kNoWriteBarrier, ::testing::Values(kNoWriteBarrier,
kFullWriteBarrier)))); kFullWriteBarrier))));
#endif
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Pure operators. // Pure operators.
......
...@@ -711,8 +711,6 @@ class SlotConstraintTest : public RegisterAllocatorTest, ...@@ -711,8 +711,6 @@ class SlotConstraintTest : public RegisterAllocatorTest,
} // namespace } // namespace
#if GTEST_HAS_COMBINE
TEST_P(SlotConstraintTest, SlotConstraint) { TEST_P(SlotConstraintTest, SlotConstraint) {
StartBlock(); StartBlock();
VReg p_0; VReg p_0;
...@@ -762,8 +760,6 @@ INSTANTIATE_TEST_CASE_P( ...@@ -762,8 +760,6 @@ INSTANTIATE_TEST_CASE_P(
::testing::Combine(::testing::ValuesIn(kParameterTypes), ::testing::Combine(::testing::ValuesIn(kParameterTypes),
::testing::Range(0, SlotConstraintTest::kMaxVariant))); ::testing::Range(0, SlotConstraintTest::kMaxVariant)));
#endif // GTEST_HAS_COMBINE
} // namespace compiler } // namespace compiler
} // namespace internal } // namespace internal
} // namespace v8 } // namespace v8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment