diff options
| author | Ian Rogers <irogers@google.com> | 2014-08-26 19:59:52 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-08-26 19:59:52 -0700 |
| commit | 9fcaa4b46789650c42d819f163781312e463b6ce (patch) | |
| tree | 344afa5f8dc647e6b2b04d9780ab8d497dbfa0d9 /test/Android.run-test.mk | |
| parent | ff092c2d5f672979c97f4c3b9d165e609ccf7ce0 (diff) | |
| download | art-9fcaa4b46789650c42d819f163781312e463b6ce.zip art-9fcaa4b46789650c42d819f163781312e463b6ce.tar.gz art-9fcaa4b46789650c42d819f163781312e463b6ce.tar.bz2 | |
Fix test build targets.
Missing includes for libarttest.
Missed merge for adding IMAGE_TYPES to known broken tests.
Change-Id: I64227b3410bac9a1de8e0efd3b89eab78cd3cf5b
Diffstat (limited to 'test/Android.run-test.mk')
| -rw-r--r-- | test/Android.run-test.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 214584d..8a3dbc9 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -123,7 +123,7 @@ TEST_ART_BROKEN_PREBUILD_RUN_TESTS := \ ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),prebuild, \ $(COMPILER_TYPES), $(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \ - $(TEST_ART_BROKEN_PREBUILD_RUN_TESTS), $(ALL_ADDRESS_SIZES)) + $(IMAGE_TYPES), $(TEST_ART_BROKEN_PREBUILD_RUN_TESTS), $(ALL_ADDRESS_SIZES)) # NB 117-nopatchoat is not broken per-se it just doesn't work (and isn't meant to) without --prebuild --relocate TEST_ART_BROKEN_NO_RELOCATE_TESTS := \ @@ -131,14 +131,14 @@ TEST_ART_BROKEN_NO_RELOCATE_TESTS := \ ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(PREBUILD_TYPES), \ $(COMPILER_TYPES), no-relocate,$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \ - $(TEST_ART_BROKEN_NO_RELOCATE_TESTS), $(ALL_ADDRESS_SIZES)) + $(IMAGE_TYPES), $(TEST_ART_BROKEN_NO_RELOCATE_TESTS), $(ALL_ADDRESS_SIZES)) TEST_ART_BROKEN_NO_PREBUILD_TESTS := \ 117-nopatchoat ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),no-prebuild, \ $(COMPILER_TYPES), $(RELOCATE_TYPES),$(TRACE_TYPES),$(GC_TYPES),$(JNI_TYPES), \ - $(TEST_ART_BROKEN_NO_PREBUILD_TESTS), $(ALL_ADDRESS_SIZES)) + $(IMAGE_TYPES), $(TEST_ART_BROKEN_NO_PREBUILD_TESTS), $(ALL_ADDRESS_SIZES)) # Tests that are broken with tracing. TEST_ART_BROKEN_TRACE_RUN_TESTS := \ @@ -554,3 +554,6 @@ GC_TYPES := JNI_TYPES := IMAGE_TYPES := ALL_ADDRESS_SIZES := + +include $(LOCAL_PATH)/Android.libarttest.mk +include art/test/Android.libnativebridgetest.mk |