diff options
| author | 2025-03-14 18:00:37 +0000 | |
|---|---|---|
| committer | 2025-03-20 15:50:43 -0700 | |
| commit | 6f3beba5e01780c30364e34be15335da51c4e0e5 (patch) | |
| tree | 1f7fcdeefd53e4601a5ad585f9da0765870ce483 /compiler/optimizing | |
| parent | 8badd481972993739e7711258f03a44638ca87a5 (diff) | |
Move more path logic for tests to testing.cc, so it can be used without
depending on CommonArtTest.
Preparation to fix the libart-gtest dependency in
art_standalone_libartpalette_tests.
Due to a new #include, this necessitated fixing a bunch of `testing`
namespace references that could become ambigious wrt `art::testing`.
Test: m generate-boot-image
Test: art/tools/buildbot-build.sh
Bug: 404306250
Change-Id: Iafb3d73148125775c9c5ddbcbaef39dc61859118
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/instruction_simplifier_test.cc | 8 | ||||
| -rw-r--r-- | compiler/optimizing/load_store_elimination_test.cc | 18 | ||||
| -rw-r--r-- | compiler/optimizing/reference_type_propagation_test.cc | 28 |
3 files changed, 27 insertions, 27 deletions
diff --git a/compiler/optimizing/instruction_simplifier_test.cc b/compiler/optimizing/instruction_simplifier_test.cc index a2e3882c19..448dc32006 100644 --- a/compiler/optimizing/instruction_simplifier_test.cc +++ b/compiler/optimizing/instruction_simplifier_test.cc @@ -234,9 +234,9 @@ TEST_P(InstanceOfInstructionSimplifierTestGroup, ExactClassCheckCastOther) { INSTANTIATE_TEST_SUITE_P(InstructionSimplifierTest, InstanceOfInstructionSimplifierTestGroup, - testing::Values(InstanceOfKind::kSelf, - InstanceOfKind::kUnrelatedLoaded, - InstanceOfKind::kUnrelatedUnloaded, - InstanceOfKind::kSupertype)); + ::testing::Values(InstanceOfKind::kSelf, + InstanceOfKind::kUnrelatedLoaded, + InstanceOfKind::kUnrelatedUnloaded, + InstanceOfKind::kSupertype)); } // namespace art diff --git a/compiler/optimizing/load_store_elimination_test.cc b/compiler/optimizing/load_store_elimination_test.cc index bb73688b89..af039229af 100644 --- a/compiler/optimizing/load_store_elimination_test.cc +++ b/compiler/optimizing/load_store_elimination_test.cc @@ -1779,17 +1779,17 @@ TEST_P(TwoTypesConversionsTestGroup, MergingConvertedValueStorePhiDeduplication) } auto Int32AndSmallerTypesGenerator() { - return testing::Values(DataType::Type::kInt32, - DataType::Type::kInt16, - DataType::Type::kInt8, - DataType::Type::kUint16, - DataType::Type::kUint8); + return ::testing::Values(DataType::Type::kInt32, + DataType::Type::kInt16, + DataType::Type::kInt8, + DataType::Type::kUint16, + DataType::Type::kUint8); } -INSTANTIATE_TEST_SUITE_P( - LoadStoreEliminationTest, - TwoTypesConversionsTestGroup, - testing::Combine(Int32AndSmallerTypesGenerator(), Int32AndSmallerTypesGenerator())); +INSTANTIATE_TEST_SUITE_P(LoadStoreEliminationTest, + TwoTypesConversionsTestGroup, + ::testing::Combine(Int32AndSmallerTypesGenerator(), + Int32AndSmallerTypesGenerator())); // // ENTRY // obj = new Obj(); diff --git a/compiler/optimizing/reference_type_propagation_test.cc b/compiler/optimizing/reference_type_propagation_test.cc index 0e0acd11c2..f720b8d911 100644 --- a/compiler/optimizing/reference_type_propagation_test.cc +++ b/compiler/optimizing/reference_type_propagation_test.cc @@ -496,16 +496,16 @@ TEST_P(LoopReferenceTypePropagationTestGroup, RunVisitTest) { INSTANTIATE_TEST_SUITE_P(ReferenceTypePropagationTest, LoopReferenceTypePropagationTestGroup, - testing::Combine(testing::Values(ShuffleOrder::kAlmostTopological, - ShuffleOrder::kReverseTopological, - ShuffleOrder::kTopological, - ShuffleOrder::kRandom), - testing::Values(-1, 10, 40), - testing::Values(0, 1), - testing::Values(InitialNullState::kAllNonNull, - InitialNullState::kAllNull, - InitialNullState::kHalfNull, - InitialNullState::kRandom))); + ::testing::Combine(::testing::Values(ShuffleOrder::kAlmostTopological, + ShuffleOrder::kReverseTopological, + ShuffleOrder::kTopological, + ShuffleOrder::kRandom), + ::testing::Values(-1, 10, 40), + ::testing::Values(0, 1), + ::testing::Values(InitialNullState::kAllNonNull, + InitialNullState::kAllNull, + InitialNullState::kHalfNull, + InitialNullState::kRandom))); TEST_P(NonLoopReferenceTypePropagationTestGroup, RunVisitTest) { RunVisitListTest([&](std::vector<HInstruction*>& lst) { MutateList(lst, GetParam()); }); @@ -513,9 +513,9 @@ TEST_P(NonLoopReferenceTypePropagationTestGroup, RunVisitTest) { INSTANTIATE_TEST_SUITE_P(ReferenceTypePropagationTest, NonLoopReferenceTypePropagationTestGroup, - testing::Values(ShuffleOrder::kAlmostTopological, - ShuffleOrder::kReverseTopological, - ShuffleOrder::kTopological, - ShuffleOrder::kRandom)); + ::testing::Values(ShuffleOrder::kAlmostTopological, + ShuffleOrder::kReverseTopological, + ShuffleOrder::kTopological, + ShuffleOrder::kRandom)); } // namespace art |