diff options
| author | 2024-08-15 19:04:56 +0000 | |
|---|---|---|
| committer | 2024-08-15 23:12:41 +0000 | |
| commit | 73a49cd990a10d7e21d41be001170e72e6ba3d49 (patch) | |
| tree | c42126ab1ed36dc2a4703cc217dce622d2cbc802 | |
| parent | 389340dc009588d325bd84c8883c4eb43aea5b65 (diff) | |
Revert "Remove ART Service tests from chroot tests."
This reverts commit a18a521d868568b3b4436d1f26e52e2934434104.
Reason for revert: Droidmonitor created revert due to b/360150490. Will be verifying through ABTD before submission.
Change-Id: I76cb1f3a84acdb2ad0d595255c591f795a4651d6
| -rw-r--r-- | build/apex/Android.bp | 3 | ||||
| -rwxr-xr-x | build/apex/art_apex_test.py | 3 | ||||
| -rwxr-xr-x | tools/buildbot-build.sh | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/build/apex/Android.bp b/build/apex/Android.bp index 690ee4f7f5..f4d3d5a6c5 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -360,6 +360,9 @@ art_gtests = [ // ART gtests for which the "first" version is preferred. art_gtests_first = [ + "art_artd_tests", + "art_libartservice_tests", + "art_libarttools_tests", "art_odrefresh_tests", ] diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py index 86059255a2..d435cd77ef 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -710,6 +710,7 @@ class TestingTargetChecker: self._checker.check_dir(arch_dir) # Check ART test binaries. + self._checker.check_art_test_executable('art_artd_tests', MULTILIB_FIRST) self._checker.check_art_test_executable('art_cmdline_tests') self._checker.check_art_test_executable('art_compiler_tests') self._checker.check_art_test_executable('art_dex2oat_tests') @@ -721,6 +722,8 @@ class TestingTargetChecker: self._checker.check_art_test_executable('art_imgdiag_tests') self._checker.check_art_test_executable('art_libartbase_tests') self._checker.check_art_test_executable('art_libartpalette_tests') + self._checker.check_art_test_executable('art_libartservice_tests', MULTILIB_FIRST) + self._checker.check_art_test_executable('art_libarttools_tests', MULTILIB_FIRST) self._checker.check_art_test_executable('art_libdexfile_support_tests') self._checker.check_art_test_executable('art_libdexfile_tests') self._checker.check_art_test_executable('art_libprofile_tests') diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index eb95d350c4..897f48d0a2 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -181,6 +181,8 @@ if [[ $build_target == "yes" ]]; then make_command+=" deapexer" # Needed to generate the primary boot image for testing. make_command+=" generate-boot-image" + # Data file needed by the `ArtExecTest.SetTaskProfiles` test. + make_command+=" task_profiles.json" # Build/install the required APEXes. make_command+=" ${apexes[*]}" make_command+=" ${specific_targets}" |