summaryrefslogtreecommitdiff
path: root/test/testrunner/testrunner.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/testrunner/testrunner.py')
-rwxr-xr-xtest/testrunner/testrunner.py9
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