commit c8f23fc19726245da6a11fa2d92e319b9d26c019
author Nicolas Geoffray <ngeoffray@google.com> Tue Oct 28 17:59:47 2014 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Oct 29 13:08:57 2014 +0000
tree 0d61966d878c39aa30b0a3cd629554e7089619c2
parent 7c049c1f34220b0dc1a7f68f3b30f388bae7bdb9

Provide an option to run run-tests with a local dalvikvm.

Instead of overwriting /system, use a temporary directory
to push the binaries and libraries, and use them for
running the tests.

Change-Id: I45fa2ac51f836686d8e8676907eb26629f7ab2ab

test/Android.run-test.mk

diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 2bff720..854de57 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -588,6 +588,9 @@
   run_test_rule_name := test-art-$(1)-run-test-$(2)-$(3)-$(4)-$(5)-$(6)-$(7)-$(8)-$(9)-$(10)-$(11)$(12)
   run_test_options := --output-path $(ART_HOST_TEST_DIR)/run-test-output/$$(run_test_rule_name) \
       $$(run_test_options)
+  ifneq ($(ART_TEST_ANDROID_ROOT),)
+    run_test_options := --android-root $(ART_TEST_ANDROID_ROOT) $$(run_test_options)
+  endif
 $$(run_test_rule_name): PRIVATE_RUN_TEST_OPTIONS := $$(run_test_options)
 .PHONY: $$(run_test_rule_name)
 $$(run_test_rule_name): $(DX) $(HOST_OUT_EXECUTABLES)/jasmin $(HOST_OUT_EXECUTABLES)/smali $(HOST_OUT_EXECUTABLES)/dexmerger $$(prereq_rule)