diff options
| author | Andreas Gampe <agampe@google.com> | 2014-10-03 16:15:37 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-10 19:09:36 -0700 |
| commit | 8fda9f2aec6820ebf1bd550412ec99d9eb3ffa9e (patch) | |
| tree | 1f71ee1840217bda7bb3937f3f06f7eb7f0bc34e /test/Android.run-test.mk | |
| parent | eac2738941bc603b8f9fea347b548bfc0c3e3f7a (diff) | |
| download | art-8fda9f2aec6820ebf1bd550412ec99d9eb3ffa9e.zip art-8fda9f2aec6820ebf1bd550412ec99d9eb3ffa9e.tar.gz art-8fda9f2aec6820ebf1bd550412ec99d9eb3ffa9e.tar.bz2 | |
ART: Add smali-based run-test
Add run-test 800 for smali-based tests. To use, drop a smali file
into the src/ directory and add a TestCase in src/Main.java.
Bug: 17814475
Change-Id: Ica9eb830689862cb3a4ffa0019fbc447c01af744
Diffstat (limited to 'test/Android.run-test.mk')
| -rw-r--r-- | test/Android.run-test.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 57b7b33..9082b47 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -36,9 +36,11 @@ TEST_ART_RUN_TEST_BUILD_RULES := # $(1): the test number define define-build-art-run-test dmart_target := $(art_run_tests_dir)/art-run-tests/$(1)/touch -$$(dmart_target): $(DX) $(HOST_OUT_EXECUTABLES)/jasmin +$$(dmart_target): $(DX) $(HOST_OUT_EXECUTABLES)/jasmin $(HOST_OUT_EXECUTABLES)/smali $(HOST_OUT_EXECUTABLES)/dexmerger $(hide) rm -rf $$(dir $$@) && mkdir -p $$(dir $$@) $(hide) DX=$(abspath $(DX)) JASMIN=$(abspath $(HOST_OUT_EXECUTABLES)/jasmin) \ + SMALI=$(abspath $(HOST_OUT_EXECUTABLES)/smali) \ + DXMERGER=$(abspath $(HOST_OUT_EXECUTABLES)/dexmerger) \ $(LOCAL_PATH)/run-test --build-only --output-path $$(abspath $$(dir $$@)) $(1) $(hide) touch $$@ @@ -50,7 +52,7 @@ $(foreach test, $(TEST_ART_RUN_TESTS), $(eval $(call define-build-art-run-test,$ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_MODULE := art-run-tests -LOCAL_ADDITIONAL_DEPENDENCIES := $(TEST_ART_RUN_TEST_BUILD_RULES) +LOCAL_ADDITIONAL_DEPENDENCIES := $(TEST_ART_RUN_TEST_BUILD_RULES) smali dexmerger # The build system use this flag to pick up files generated by declare-make-art-run-test. LOCAL_PICKUP_FILES := $(art_run_tests_dir) @@ -455,9 +457,11 @@ define define-test-art-run-test $$(run_test_options) $$(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 $$(prereq_rule) +$$(run_test_rule_name): $(DX) $(HOST_OUT_EXECUTABLES)/jasmin $(HOST_OUT_EXECUTABLES)/smali $(HOST_OUT_EXECUTABLES)/dexmerger $$(prereq_rule) $(hide) $$(call ART_TEST_SKIP,$$@) && \ DX=$(abspath $(DX)) JASMIN=$(abspath $(HOST_OUT_EXECUTABLES)/jasmin) \ + SMALI=$(abspath $(HOST_OUT_EXECUTABLES)/smali) \ + DXMERGER=$(abspath $(HOST_OUT_EXECUTABLES)/dexmerger) \ art/test/run-test $$(PRIVATE_RUN_TEST_OPTIONS) $(9) \ && $$(call ART_TEST_PASSED,$$@) || $$(call ART_TEST_FAILED,$$@) $$(hide) (echo $(MAKECMDGOALS) | grep -q $$@ && \ |