Merge "Revert "Disable 554-jit-profile-file for unsupported test modes"" am: 15b103f728 am: 67041ca144
am: 5b1d5394ca
* commit '5b1d5394cae08e9dfb39f54dc1bc485b6f3cb82b':
Revert "Disable 554-jit-profile-file for unsupported test modes"
diff --git a/runtime/jit/offline_profiling_info.cc b/runtime/jit/offline_profiling_info.cc
index 7615870..fcdbd12 100644
--- a/runtime/jit/offline_profiling_info.cc
+++ b/runtime/jit/offline_profiling_info.cc
@@ -361,7 +361,7 @@
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 a6f4f62..7e3e8a6 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -298,7 +298,6 @@
412-new-array \
471-uninitialized-locals \
506-verify-aput \
- 554-jit-profile-file \
800-smali
ifneq (,$(filter interp-ac,$(COMPILER_TYPES)))
@@ -357,15 +356,13 @@
# 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 +413,7 @@
# 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), \
@@ -528,8 +524,7 @@
# 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)))