diff options
| -rw-r--r-- | artd/art_standalone_artd_tests.xml | 2 | ||||
| -rw-r--r-- | artd/artd_test.cc | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/artd/art_standalone_artd_tests.xml b/artd/art_standalone_artd_tests.xml index 9125046d58..8a48b84aaf 100644 --- a/artd/art_standalone_artd_tests.xml +++ b/artd/art_standalone_artd_tests.xml @@ -15,8 +15,6 @@ --> <!-- Note: This test config file for {MODULE} is generated from a template. --> <configuration description="Runs {MODULE}."> - <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/> - <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> <option name="cleanup" value="true" /> <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}/{MODULE}" /> diff --git a/artd/artd_test.cc b/artd/artd_test.cc index 1fca5a7bbf..8b24b9db77 100644 --- a/artd/artd_test.cc +++ b/artd/artd_test.cc @@ -117,6 +117,8 @@ using TmpProfilePath = ProfilePath::TmpProfilePath; using ::fmt::literals::operator""_format; // NOLINT +constexpr uid_t kRootUid = 0; + ScopeGuard<std::function<void()>> ScopedSetLogger(android::base::LogFunction&& logger) { android::base::LogFunction old_logger = android::base::SetLogger(std::move(logger)); return make_scope_guard([old_logger = std::move(old_logger)]() mutable { @@ -1840,6 +1842,11 @@ TEST_F(ArtdTest, mergeProfilesWithOptionsDumpClassesAndMethods) { } TEST_F(ArtdTest, cleanup) { + // TODO(b/289037540): Fix this. + if (getuid() != kRootUid) { + GTEST_SKIP() << "This test requires root access"; + } + std::vector<std::string> gc_removed_files; std::vector<std::string> gc_kept_files; |