From 6f3beba5e01780c30364e34be15335da51c4e0e5 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Fri, 14 Mar 2025 18:00:37 +0000 Subject: 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 --- compiler/utils/assembler_test_base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compiler/utils/assembler_test_base.h') diff --git a/compiler/utils/assembler_test_base.h b/compiler/utils/assembler_test_base.h index 0a89ad1299..515361af00 100644 --- a/compiler/utils/assembler_test_base.h +++ b/compiler/utils/assembler_test_base.h @@ -42,7 +42,7 @@ namespace art HIDDEN { static constexpr bool kKeepDisassembledFiles = false; // We put this into a class as gtests are self-contained, so this helper needs to be in an h-file. -class AssemblerTestBase : public testing::Test { +class AssemblerTestBase : public ::testing::Test { public: AssemblerTestBase() {} -- cgit v1.2.3-59-g8ed1b