diff options
| -rw-r--r-- | runtime/jit/offline_profiling_info.cc | 2 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/runtime/jit/offline_profiling_info.cc b/runtime/jit/offline_profiling_info.cc index 761587024c..fcdbd12699 100644 --- a/runtime/jit/offline_profiling_info.cc +++ b/runtime/jit/offline_profiling_info.cc @@ -361,7 +361,7 @@ std::string ProfileCompilationInfo::DumpInfo(bool print_full_dex_location) const os << "ProfileInfo:"; - // Use an additional map to achieve a predefined order based on the dex locations. + // Use an additional map to achieve a predefined ordered based on the dex locations. SafeMap<const std::string, const DexFile*> dex_locations_map; for (auto info_it : info_) { dex_locations_map.Put(info_it.first->GetLocation(), info_it.first); diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 420c722e76..c830ad460e 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -267,9 +267,7 @@ ifneq (,$(filter no-prebuild,$(PREBUILD_TYPES))) $(IMAGE_TYPES), $(PICTEST_TYPES), $(DEBUGGABLE_TYPES), $(TEST_ART_BROKEN_NO_PREBUILD_TESTS), $(ALL_ADDRESS_SIZES)) endif -# 554-jit-profile-file is disabled because it needs a primary oat file to know what it should save. TEST_ART_BROKEN_NO_PREBUILD_TESTS := - 554-jit-profile-file # Note 117-nopatchoat is not broken per-se it just doesn't work (and isn't meant to) without # --prebuild --relocate @@ -298,7 +296,6 @@ TEST_ART_BROKEN_INTERPRETER_ACCESS_CHECK_TESTS := \ 412-new-array \ 471-uninitialized-locals \ 506-verify-aput \ - 554-jit-profile-file \ 800-smali ifneq (,$(filter interp-ac,$(COMPILER_TYPES))) @@ -357,15 +354,13 @@ ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),ndebug,$(PREB # All these tests check that we have sane behavior if we don't have a patchoat or dex2oat. # Therefore we shouldn't run them in situations where we actually don't have these since they # explicitly test for them. These all also assume we have an image. -# 554-jit-profile-file is disabled because it needs a primary oat file to know what it should save. TEST_ART_BROKEN_FALLBACK_RUN_TESTS := \ 116-nodex2oat \ 117-nopatchoat \ 118-noimage-dex2oat \ 119-noimage-patchoat \ 137-cfi \ - 138-duplicate-classes-check2 \ - 554-jit-profile-file + 138-duplicate-classes-check2 # This test fails without an image. TEST_ART_BROKEN_NO_IMAGE_RUN_TESTS := \ @@ -416,8 +411,7 @@ endif # Known broken tests for the interpreter. # CFI unwinding expects managed frames. TEST_ART_BROKEN_INTERPRETER_RUN_TESTS := \ - 137-cfi \ - 554-jit-profile-file + 137-cfi ifneq (,$(filter interpreter,$(COMPILER_TYPES))) ART_TEST_KNOWN_BROKEN += $(call all-run-test-names,$(TARGET_TYPES),$(RUN_TYPES),$(PREBUILD_TYPES), \ @@ -524,8 +518,7 @@ TEST_ART_BROKEN_OPTIMIZING_HEAP_POISONING_RUN_TESTS := \ # Tests that should fail in the heap poisoning configuration with the interpreter. # 137: Cannot run this with the interpreter. TEST_ART_BROKEN_INTERPRETER_HEAP_POISONING_RUN_TESTS := \ - 137-cfi \ - 554-jit-profile-file + 137-cfi ifeq ($(ART_HEAP_POISONING),true) ifneq (,$(filter default,$(COMPILER_TYPES))) |