diff options
| author | 2019-09-20 15:53:40 +0100 | |
|---|---|---|
| committer | 2019-09-24 17:40:00 +0000 | |
| commit | e58624f221b967553d7b71f14d8677ceaa000553 (patch) | |
| tree | 00d6caa5ca66562d9c8e448abc77c0c6018fca0c /test/testrunner/testrunner.py | |
| parent | 48349ad38887f65da76df268f8e548d508d8c6a1 (diff) | |
Various renames following the name change from "Runtime APEX" to "ART APEX".
In particular ANDROID_RUNTIME_ROOT is now ANDROID_ART_ROOT.
Test: Build & boot
Test: art/tools/run-gtests.sh in chroot
Test: art/test/testrunner/testrunner.py --target --64 in chroot
Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64 in chroot
Test: art/tools/run-jdwp-tests.sh --mode=device --variant=X64 in chroot
Test: m test-art-host-gtest
Test: art/test/testrunner/testrunner.py --host --64
Test: art/tools/run-jdwp-tests.sh --mode=host
Bug: 135753770
Change-Id: Ia74da964e54cf396d66e9e12ea56da4e9483662a
Diffstat (limited to 'test/testrunner/testrunner.py')
| -rwxr-xr-x | test/testrunner/testrunner.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py index 509852cacb..1fddfe8469 100755 --- a/test/testrunner/testrunner.py +++ b/test/testrunner/testrunner.py @@ -399,8 +399,9 @@ def run_tests(tests): elif target == 'jvm': options_test += ' --jvm' - # Honor ART_TEST_CHROOT, ART_TEST_ANDROID_ROOT, ART_TEST_ANDROID_RUNTIME_ROOT, - # ART_TEST_ANDROID_I18N_ROOT, and ART_TEST_ANDROID_TZDATA_ROOT but only for target tests. + # Honor ART_TEST_CHROOT, ART_TEST_ANDROID_ROOT, ART_TEST_ANDROID_ART_ROOT, + # ART_TEST_ANDROID_I18N_ROOT, and ART_TEST_ANDROID_TZDATA_ROOT but only + # for target tests. if target == 'target': if env.ART_TEST_CHROOT: options_test += ' --chroot ' + env.ART_TEST_CHROOT @@ -408,8 +409,8 @@ def run_tests(tests): options_test += ' --android-root ' + env.ART_TEST_ANDROID_ROOT if env.ART_TEST_ANDROID_I18N_ROOT: options_test += ' --android-i18n-root ' + env.ART_TEST_ANDROID_I18N_ROOT - if env.ART_TEST_ANDROID_RUNTIME_ROOT: - options_test += ' --android-runtime-root ' + env.ART_TEST_ANDROID_RUNTIME_ROOT + if env.ART_TEST_ANDROID_ART_ROOT: + options_test += ' --android-art-root ' + env.ART_TEST_ANDROID_ART_ROOT if env.ART_TEST_ANDROID_TZDATA_ROOT: options_test += ' --android-tzdata-root ' + env.ART_TEST_ANDROID_TZDATA_ROOT |