diff options
| -rwxr-xr-x | test/etc/run-test-jar | 4 | ||||
| -rwxr-xr-x | test/run-test | 12 | ||||
| -rw-r--r-- | test/testrunner/env.py | 2 | ||||
| -rwxr-xr-x | test/testrunner/testrunner.py | 5 |
4 files changed, 21 insertions, 2 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 25b8b4b55b..307476384a 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -319,6 +319,10 @@ while true; do shift ANDROID_ROOT="$1" shift + elif [ "x$1" = "x--android-runtime-root" ]; then + shift + ANDROID_RUNTIME_ROOT="$1" + shift elif [ "x$1" = "x--instruction-set-features" ]; then shift INSTRUCTION_SET_FEATURES="$1" diff --git a/test/run-test b/test/run-test index 83c726e9e5..67bcce7deb 100755 --- a/test/run-test +++ b/test/run-test @@ -386,6 +386,15 @@ while true; do android_root="$1" run_args="${run_args} --android-root $1" shift + elif [ "x$1" = "x--android-runtime-root" ]; then + shift + if [ "x$1" = "x" ]; then + echo "$0 missing argument to --android-runtime-root" 1>&2 + usage="yes" + break + fi + run_args="${run_args} --android-runtime-root $1" + shift elif [ "x$1" = "x--update" ]; then update_mode="yes" shift @@ -758,6 +767,9 @@ if [ "$usage" = "yes" ]; then echo " --never-clean Keep the test files even if the test succeeds." echo " --chroot [newroot] Run with root directory set to newroot." echo " --android-root [path] The path on target for the android root. (/system by default)." + echo " --android-runtime-root [path]" + echo " The path on target for the Android Runtime root." + echo " (/apex/com.android.runtime by default)." echo " --dex2oat-swap Use a dex2oat swap file." echo " --instruction-set-features [string]" echo " Set instruction-set-features for compilation." 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' |