Merge "Temporary disable linker-namespaces"
diff --git a/test/554-jit-profile-file/src/Main.java b/test/554-jit-profile-file/src/Main.java
index 9228070..98297ed 100644
--- a/test/554-jit-profile-file/src/Main.java
+++ b/test/554-jit-profile-file/src/Main.java
@@ -39,7 +39,7 @@
private static final String PROFILE_FILE = PKG_NAME + ".prof";
private static final String TEMP_FILE_NAME_PREFIX = "dummy";
private static final String TEMP_FILE_NAME_SUFFIX = "-file";
- private static final int JIT_INVOCATION_COUNT = 101;
+ private static final int JIT_INVOCATION_COUNT = 200;
/* needs to match Runtime:: kProfileBackground */
private static final int PROFILE_BACKGROUND = 1;
@@ -72,8 +72,8 @@
o.hotMethod();
}
- // Sleep for 1 second to make sure that the methods had a chance to get compiled.
- Thread.sleep(1000);
+ // Sleep for 2 second to make sure that the methods had a chance to get compiled.
+ Thread.sleep(2000);
// Updating the process state to BACKGROUND will trigger profile saving.
VMRuntime.updateProcessState(PROFILE_BACKGROUND);
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 853db0b..1d5af3f 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -516,7 +516,7 @@
# 137: Read barrier forces interpreter. Cannot run this with the interpreter.
# 537: Expects an array copy to be intrinsified, but calling-on-slowpath intrinsics are not yet
# handled in the read barrier configuration.
-# 554: Cannot run in interpreter mode and this rule cover both: the compiler and the interpreter.
+# 554: Cannot run in interpreter mode and this rule covers both: the compiler and the interpreter.
TEST_ART_BROKEN_READ_BARRIER_RUN_TESTS := \
055-enum-performance \
137-cfi \
