From 0098033496f9a1f3a1e53bb3b068effeaa37f5fb Mon Sep 17 00:00:00 2001
From: Ulya Trofimovich <skvadrik@google.com>
Date: Wed, 13 Nov 2024 09:24:39 +0000
Subject: Don't assume mainline boot jars presence when running tests on VM.

ParsedOptionsTest has been failing on QEMU/arm64 but not on QEMU/riscv64
because for riscv64 there was a special case hardcoded in the logic (it
is removed in this commit -- it's not the architecture that matters, but
the VM environment).

Test: ParsedOptionsTest on VM passed:

    export SOONG_ALLOW_MISSING_DEPENDENCIES=true
    export ART_TEST_SSH_USER=ubuntu
    export ART_TEST_SSH_HOST=localhost
    export ART_TEST_SSH_PORT=10002
    export ART_TEST_ON_VM=true

    . ./build/envsetup.sh
    lunch armv8-trunk_staging-eng
    art/tools/buildbot-build.sh --target -j72 #--installclean

    . art/tools/buildbot-utils.sh
    art/tools/buildbot-cleanup-device.sh
    art/tools/buildbot-setup-device.sh
    art/tools/buildbot-sync.sh

    art/tools/run-gtests.sh /apex/com.android.art/bin/art/arm64/art_runtime_tests -- --gtest_filter='*ParsedOptionsTest*'

Change-Id: I97bad80b931bd0c92c25eae55e79c1c2d7e89801
---
 libartbase/base/file_utils.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'libartbase/base/file_utils.cc')

diff --git a/libartbase/base/file_utils.cc b/libartbase/base/file_utils.cc
index 1f09e7326e..0b3811e5e4 100644
--- a/libartbase/base/file_utils.cc
+++ b/libartbase/base/file_utils.cc
@@ -375,7 +375,7 @@ static bool MaybeAppendBootImageMainlineExtension(const std::string& android_roo
                                                   bool deny_art_apex_data_files,
                                                   /*inout*/ std::string* location,
                                                   /*out*/ std::string* error_msg) {
-  if (!kIsTargetAndroid) {
+  if (!kIsTargetAndroid || RunningOnVM()) {
     return true;
   }
   // Due to how the runtime determines the mapping between boot images and bootclasspath jars, the
@@ -383,9 +383,6 @@ static bool MaybeAppendBootImageMainlineExtension(const std::string& android_roo
   // `<primary-boot-image-stem>-<first-library-name>.art`.
   std::string library_name = GetFirstMainlineFrameworkLibraryName(error_msg);
   if (library_name.empty()) {
-    if (kRuntimeISA == InstructionSet::kRiscv64) {
-      return true;
-    }
     return false;
   }
 
-- 
cgit v1.2.3-59-g8ed1b