diff options
| author | 2024-08-09 23:35:51 +0100 | |
|---|---|---|
| committer | 2024-08-13 17:09:38 +0000 | |
| commit | 649a2e6c1771a26bfacd00b0ee6c587361ebcdfd (patch) | |
| tree | a50fda18ffdca97be67a5ef7d51b6554cbc8c95f /dexopt_chroot_setup | |
| parent | 275cf7423efdb36e441b7bceb2e678944f8fa34b (diff) | |
Simplify test configs by disabling append-bitness and pushing the whole
test directory instead.
Using append-bitness with FilePusher apparently disables pushing of the
whole directory. If we remove it and push the test directory instead,
we won't need to append bitness since it's added implicitly (and the
test directory also has arch subdirectories).
Without append-bitness we can also switch to PushFilePreparer, because
that flag is the only difference between them.
By pushing the whole test directory it's possible to clean up several
cases where it was necessary to push other files with the tests.
Test configs that invoke generate-boot-image on the device aren't so
easy to fix this way, because we must expand the right path to the
binary inside the test directory. Hence they're kept as-is for now.
#codehealth
Test: atest -a art_libnativebridge_cts_tests art_standalone_artd_tests \
art_standalone_cmdline_tests art_standalone_compiler_tests \
art_standalone_dex2oat_cts_tests art_standalone_dex2oat_tests \
art_standalone_dexdump_tests art_standalone_dexlist_tests \
art_standalone_dexopt_chroot_setup_tests \
art_standalone_dexoptanalyzer_tests art_standalone_dexpreopt_tests \
art_standalone_disassembler_tests art_standalone_libartbase_tests \
art_standalone_libartpalette_tests \
art_standalone_libartservice_tests art_standalone_libarttools_tests \
art_standalone_libdexfile_external_tests \
art_standalone_libdexfile_support_tests \
art_standalone_libdexfile_tests art_standalone_libprofile_tests \
art_standalone_oatdump_tests art_standalone_odrefresh_tests \
art_standalone_profman_tests art_standalone_runtime_tests \
art_standalone_sigchain_tests libnativeloader_lazy_test \
libnativeloader_test libnativebridge-tests
Change-Id: I7c524a856821a5ee2b53d53e84793bf6527b970b
Diffstat (limited to 'dexopt_chroot_setup')
| -rw-r--r-- | dexopt_chroot_setup/art_standalone_dexopt_chroot_setup_tests.xml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/dexopt_chroot_setup/art_standalone_dexopt_chroot_setup_tests.xml b/dexopt_chroot_setup/art_standalone_dexopt_chroot_setup_tests.xml index ad37eb0104..e4ba301579 100644 --- a/dexopt_chroot_setup/art_standalone_dexopt_chroot_setup_tests.xml +++ b/dexopt_chroot_setup/art_standalone_dexopt_chroot_setup_tests.xml @@ -24,19 +24,13 @@ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" /> <target_preparer class="com.android.tradefed.targetprep.DisableSELinuxTargetPreparer" /> - <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> <option name="cleanup" value="true" /> - <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}/{MODULE}" /> - <option name="append-bitness" value="true" /> - </target_preparer> - - <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> - <option name="cleanup" value="true" /> - <option name="push" value="art-gtest-jars-Main.jar->/data/local/tmp/{MODULE}/art-gtest-jars-Main.jar" /> + <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" /> </target_preparer> <test class="com.android.tradefed.testtype.GTest" > - <option name="native-test-device-path" value="/data/local/tmp/{MODULE}" /> + <option name="native-test-device-path" value="/data/local/tmp" /> <option name="module-name" value="{MODULE}" /> </test> |