diff options
Diffstat (limited to 'test/testrunner')
| -rw-r--r-- | test/testrunner/env.py | 2 | ||||
| -rwxr-xr-x | test/testrunner/testrunner.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/testrunner/env.py b/test/testrunner/env.py index 1f4b829989..c2d5e7d5fa 100644 --- a/test/testrunner/env.py +++ b/test/testrunner/env.py @@ -89,8 +89,8 @@ HOST_2ND_ARCH_PREFIX_DEX2OAT_HOST_INSTRUCTION_SET_FEATURES = _env.get( HOST_2ND_ARCH_PREFIX + 'DEX2OAT_HOST_INSTRUCTION_SET_FEATURES') ART_TEST_CHROOT = _env.get('ART_TEST_CHROOT') - ART_TEST_ANDROID_ROOT = _env.get('ART_TEST_ANDROID_ROOT') +ART_TEST_ANDROID_RUNTIME_ROOT = _env.get('ART_TEST_ANDROID_RUNTIME_ROOT') ART_TEST_WITH_STRACE = _getEnvBoolean('ART_TEST_DEBUG_GC', False) diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py index 4e873c1ba2..0456fdb55c 100755 --- a/test/testrunner/testrunner.py +++ b/test/testrunner/testrunner.py @@ -400,12 +400,15 @@ def run_tests(tests): elif target == 'jvm': options_test += ' --jvm' - # Honor ART_TEST_CHROOT and ART_TEST_ANDROID_ROOT, but only for target tests. + # Honor ART_TEST_CHROOT, ART_TEST_ANDROID_ROOT and ART_TEST_ANDROID_RUNTIME_ROOT, + # but only for target tests. if target == 'target': if env.ART_TEST_CHROOT: options_test += ' --chroot ' + env.ART_TEST_CHROOT if env.ART_TEST_ANDROID_ROOT: options_test += ' --android-root ' + env.ART_TEST_ANDROID_ROOT + if env.ART_TEST_ANDROID_RUNTIME_ROOT: + options_test += ' --android-runtime-root ' + env.ART_TEST_ANDROID_RUNTIME_ROOT if run == 'ndebug': options_test += ' -O' |