commit 7ffce8f3a2eb7de119c8ab79e549225e8ca2c0ef
author Jiakai Zhang <jiakaiz@google.com> Wed Feb 16 11:15:23 2022 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 16 13:16:47 2022 +0000
tree 98ae5474816cabe75cba56be3306c995d6b3b1f4
parent 7f3aed12464a96e3435af0bd4373d13f25b809dd

Fix Dex2oatCtsTest.

Bug: 219757457
Test: atest art_standalone_dex2oat_cts_tests:Dex2oatCtsTest#CompilationHooks
Change-Id: Ie17dfdc295b7d70d1a32a4e41aa35bef73f91b64

dex2oat/Android.bp

diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 86e9c7a..e5c2f12 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -590,6 +590,7 @@
         ":art-gtest-jars-MultiDex",
         ":art-gtest-jars-MultiDexModifiedSecondary",
         ":art-gtest-jars-Nested",
+        ":generate-boot-image",
     ],
     test_config: "art_standalone_dex2oat_cts_tests.xml",
     test_suites: ["cts"],

dex2oat/art_standalone_dex2oat_cts_tests.xml

diff --git a/dex2oat/art_standalone_dex2oat_cts_tests.xml b/dex2oat/art_standalone_dex2oat_cts_tests.xml
index b61c3f3..980b295 100644
--- a/dex2oat/art_standalone_dex2oat_cts_tests.xml
+++ b/dex2oat/art_standalone_dex2oat_cts_tests.xml
@@ -35,6 +35,19 @@
         <option name="push" value="art-gtest-jars-Nested.jar->/data/local/tmp/art_standalone_dex2oat_cts_tests/art-gtest-jars-Nested.jar" />
     </target_preparer>
 
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
+        <option name="append-bitness" value="true" />
+        <option name="push-file" key="generate-boot-image" value="/data/local/tmp/art_standalone_dex2oat_cts_tests/generate-boot-image" />
+    </target_preparer>
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="throw-if-cmd-fail" value="true" />
+        <option name="run-command" value="mkdir -p /data/local/tmp/art_standalone_dex2oat_cts_tests/art_boot_images" />
+        <option name="run-command" value="/data/local/tmp/art_standalone_dex2oat_cts_tests/generate-boot-image --output-dir=/data/local/tmp/art_standalone_dex2oat_cts_tests/art_boot_images" />
+        <option name="teardown-command" value="rm -rf /data/local/tmp/art_standalone_dex2oat_cts_tests/art_boot_images" />
+    </target_preparer>
+
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp/art_standalone_dex2oat_cts_tests" />
         <option name="module-name" value="art_standalone_dex2oat_cts_tests" />