diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-31 15:13:10 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-31 15:13:10 -0700 |
| commit | dbaa93a4265e2fdbe729ec58f543a4042ccd2d8e (patch) | |
| tree | 7f980ff6058b6cb13c98bc7eb9ec710c7f071722 /test | |
| parent | 65573efdbaece978173ac45c170b1fe21c700396 (diff) | |
| download | art-dbaa93a4265e2fdbe729ec58f543a4042ccd2d8e.tar.gz art-dbaa93a4265e2fdbe729ec58f543a4042ccd2d8e.tar.bz2 art-dbaa93a4265e2fdbe729ec58f543a4042ccd2d8e.zip | |
Make test-art-host-run-test and test-art-host-oat run with and without interpreter.
Change-Id: I54e7162c839910fcf8b8a394aebff2d3c807ccfb
Diffstat (limited to 'test')
| -rw-r--r-- | test/Android.mk | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/test/Android.mk b/test/Android.mk index a91ed3d846..87e15a8127 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -96,8 +96,8 @@ $(foreach dir,$(TEST_OAT_DIRECTORIES), $(eval $(call build-art-test-dex,oat-test ######################################################################## ART_TEST_TARGET_OAT_TARGETS := -ART_TEST_HOST_OAT_TARGETS := -ART_TEST_HOST_INTERPRETER_OAT_TARGETS := +ART_TEST_HOST_OAT_DEFAULT_TARGETS := +ART_TEST_HOST_OAT_INTERPRETER_TARGETS := # $(1): directory # $(2): arguments @@ -113,29 +113,29 @@ test-art-target-oat-$(1): $(ART_TEST_OUT)/oat-test-dex-$(1).jar test-art-target- $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex: $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar $(HOST_CORE_IMG_OUT) | $(DEX2OAT) $(DEX2OAT) --runtime-arg -Xms16m --runtime-arg -Xmx16m --boot-image=$(HOST_CORE_IMG_OUT) --dex-file=$$< --oat-file=$$@ --instruction-set=$(HOST_ARCH) --host --host-prefix="" --android-root=$(HOST_OUT) -.PHONY: test-art-host-oat-$(1) -test-art-host-oat-$(1): $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex test-art-host-dependencies - mkdir -p /tmp/android-data/test-art-host-oat-$(1) - ANDROID_DATA=/tmp/android-data/test-art-host-oat-$(1) \ +.PHONY: test-art-host-oat-default-$(1) +test-art-host-oat-default-$(1): $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex test-art-host-dependencies + mkdir -p /tmp/android-data/test-art-host-oat-default-$(1) + ANDROID_DATA=/tmp/android-data/test-art-host-oat-default-$(1) \ ANDROID_ROOT=$(HOST_OUT) \ LD_LIBRARY_PATH=$(HOST_OUT_SHARED_LIBRARIES) \ dalvikvm -XXlib:libartd.so -Ximage:$(shell pwd)/$(HOST_CORE_IMG_OUT) -classpath $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar -Djava.library.path=$(HOST_OUT_SHARED_LIBRARIES) $(1) $(2) \ - && echo test-art-host-oat-$(1) PASSED || (echo test-art-host-oat-$(1) FAILED && exit 1) - $(hide) rm -r /tmp/android-data/test-art-host-oat-$(1) + && echo test-art-host-oat-default-$(1) PASSED || (echo test-art-host-oat-default-$(1) FAILED && exit 1) + $(hide) rm -r /tmp/android-data/test-art-host-oat-default-$(1) -.PHONY: test-art-host-interpreter-oat-$(1) -test-art-host-interpreter-oat-$(1): $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex test-art-host-dependencies - mkdir -p /tmp/android-data/test-art-host-interpreter-oat-$(1) - ANDROID_DATA=/tmp/android-data/test-art-host-interpreter-oat-$(1) \ +.PHONY: test-art-host-oat-interpreter-$(1) +test-art-host-oat-interpreter-$(1): $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex test-art-host-dependencies + mkdir -p /tmp/android-data/test-art-host-oat-interpreter-$(1) + ANDROID_DATA=/tmp/android-data/test-art-host-oat-interpreter-$(1) \ ANDROID_ROOT=$(HOST_OUT) \ LD_LIBRARY_PATH=$(HOST_OUT_SHARED_LIBRARIES) \ dalvikvm -XXlib:libartd.so -Ximage:$(shell pwd)/$(HOST_CORE_IMG_OUT) -Xint -classpath $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar -Djava.library.path=$(HOST_OUT_SHARED_LIBRARIES) $(1) $(2) \ - && echo test-art-host-interpreter-oat-$(1) PASSED || (echo test-art-host-interpreter-oat-$(1) FAILED && exit 1) - $(hide) rm -r /tmp/android-data/test-art-host-interpreter-oat-$(1) + && echo test-art-host-oat-interpreter-$(1) PASSED || (echo test-art-host-oat-interpreter-$(1) FAILED && exit 1) + $(hide) rm -r /tmp/android-data/test-art-host-oat-interpreter-$(1) ART_TEST_TARGET_OAT_TARGETS += test-art-target-oat-$(1) -ART_TEST_HOST_OAT_TARGETS += test-art-host-oat-$(1) -ART_TEST_HOST_INTERPRETER_OAT_TARGETS += test-art-host-interpreter-oat-$(1) +ART_TEST_HOST_OAT_DEFAULT_TARGETS += test-art-host-oat-default-$(1) +ART_TEST_HOST_OAT_INTERPRETER_TARGETS += test-art-host-oat-interpreter-$(1) endef $(foreach dir,$(TEST_OAT_DIRECTORIES), $(eval $(call declare-test-art-oat-targets,$(dir)))) |