diff options
| author | 2019-01-11 15:19:14 +0000 | |
|---|---|---|
| committer | 2019-01-11 15:19:14 +0000 | |
| commit | 6f463e87c92d88ee60f34d4d2d71923bb2c74f76 (patch) | |
| tree | 8d345bcba3adfac2d96f33115082e9148bebbc22 /test/testrunner/testrunner.py | |
| parent | 4a60ab2c6caac1c1d52a0a9189d4f6f36cd78a00 (diff) | |
| parent | 2807614fcef6280c78e3987289fe345a770ca5c2 (diff) | |
Merge "Add support for option `--android-runtime-root` to ART run-test scripts."
Diffstat (limited to 'test/testrunner/testrunner.py')
| -rwxr-xr-x | test/testrunner/testrunner.py | 5 |
1 files changed, 4 insertions, 1 deletions
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' |