diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-28 17:59:47 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-29 13:08:57 +0000 |
| commit | c8f23fc19726245da6a11fa2d92e319b9d26c019 (patch) | |
| tree | 0d61966d878c39aa30b0a3cd629554e7089619c2 /Android.mk | |
| parent | 7c049c1f34220b0dc1a7f68f3b30f388bae7bdb9 (diff) | |
| download | art-c8f23fc19726245da6a11fa2d92e319b9d26c019.zip art-c8f23fc19726245da6a11fa2d92e319b9d26c019.tar.gz art-c8f23fc19726245da6a11fa2d92e319b9d26c019.tar.bz2 | |
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
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -137,10 +137,17 @@ include $(art_path)/test/Android.run-test.mk # Sync test files to the target, depends upon all things that must be pushed to the target. .PHONY: test-art-target-sync +ifeq ($(ART_TEST_ANDROID_ROOT),) test-art-target-sync: $(TEST_ART_TARGET_SYNC_DEPS) adb root adb wait-for-device remount adb sync +else +test-art-target-sync: $(TEST_ART_TARGET_SYNC_DEPS) + adb root + adb wait-for-device push $(ANDROID_PRODUCT_OUT)/system $(ART_TEST_ANDROID_ROOT) + adb push $(ANDROID_PRODUCT_OUT)/data /data +endif # Undefine variable now its served its purpose. TEST_ART_TARGET_SYNC_DEPS := |