commit 5fda016fc1acb6d47f0aba94aae7e625ec7594b7
author Alex Light <allight@google.com> Wed Aug 30 07:56:59 2017 -0700
committer Alex Light <allight@google.com> Wed Aug 30 15:56:57 2017 -0700
tree 2223cb14a5880d65b3d6ffa360ee902dc0c95887
parent d0b08252a508ad86780e494462cbf005718f1c2b

Revert "Skip tests 1923 and 1924 on ASAN 64"

Fix ASAN issue by giving the test threads more stack space for these
tests.

Test: export SANITIZE_HOST=address ASAN_OPTIONS='detect_leaks=0
Test: ./test/testrunner/testrunner.py --host -j50 -t 1923
Test: ./test/testrunner/testrunner.py --host -j50 -t 1924
Bug: 65189092

This reverts commit 7cfc6598fc1a73b3a9bef44d7e654c4f172be1b8.

Change-Id: I5b985f97f00a72e769961658be451e86355f5bc7

test/1923-frame-pop/src/art/Test1923.java

diff --git a/test/1923-frame-pop/src/art/Test1923.java b/test/1923-frame-pop/src/art/Test1923.java
index b5265b7..6f41540 100644
--- a/test/1923-frame-pop/src/art/Test1923.java
+++ b/test/1923-frame-pop/src/art/Test1923.java
@@ -157,14 +157,19 @@
   public static void doRecurTestWith(final int times, int watch_frame) throws Exception {
     final String target_method_name_start = "recurTimes";
     final ThreadPauser safepoint = new ThreadPauser();
-    Thread target = new Thread(() -> {
-      try {
-        recurTimesA(times, safepoint);
-        System.out.println("Ran recurTimes(" + times + ") without errors!");
-      } catch (RecursionError e) {
-        System.out.println("Caught exception " + e + " while running recurTimes(" + times + ")");
-      }
-    });
+    Thread target = new Thread(
+        null,
+        () -> {
+          try {
+            recurTimesA(times, safepoint);
+            System.out.println("Ran recurTimes(" + times + ") without errors!");
+          } catch (RecursionError e) {
+            System.out.println("Caught exception " + e + " while running recurTimes(" + times + ")");
+          }
+        },
+        "RecurTimes(" + times + ") watching: " + watch_frame + " runner.",
+        // 4000 kb stack since ASAN can make us stack-overflow otherwise
+        4000 * 1024);
     target.start();
     safepoint.waitForOtherThreadToPause();
     Suspension.suspend(target);

test/1924-frame-pop-toggle/src/art/Test1924.java

diff --git a/test/1924-frame-pop-toggle/src/art/Test1924.java b/test/1924-frame-pop-toggle/src/art/Test1924.java
index 0ffbfc6..f0bb68c 100644
--- a/test/1924-frame-pop-toggle/src/art/Test1924.java
+++ b/test/1924-frame-pop-toggle/src/art/Test1924.java
@@ -157,14 +157,18 @@
   public static void doRecurTestWith(final int times, int watch_frame) throws Exception {
     final String target_method_name_start = "recurTimes";
     final ThreadPauser safepoint = new ThreadPauser();
-    Thread target = new Thread(() -> {
-      try {
-        recurTimesA(times, safepoint);
-        System.out.println("Ran recurTimes(" + times + ") without errors!");
-      } catch (RecursionError e) {
-        System.out.println("Caught exception " + e + " while running recurTimes(" + times + ")");
-      }
-    });
+    Thread target = new Thread(null,
+        () -> {
+          try {
+            recurTimesA(times, safepoint);
+            System.out.println("Ran recurTimes(" + times + ") without errors!");
+          } catch (RecursionError e) {
+            System.out.println("Caught exception " + e + " while running recurTimes(" + times + ")");
+          }
+        },
+        "RecurTimes(" + times + ") watching: " + watch_frame + " runner.",
+        // 4000 kb stack since ASAN can make us stack-overflow otherwise
+        4000 * 1024);
     target.start();
     safepoint.waitForOtherThreadToPause();
     Suspension.suspend(target);

test/knownfailures.json

diff --git a/test/knownfailures.json b/test/knownfailures.json
index df7544e..20cfc34 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -681,16 +681,6 @@
         "env_vars": {"SANITIZE_HOST": "address"}
     },
     {
-        "tests": [
-            "1923-frame-pop",
-            "1924-frame-pop-toggle"
-        ],
-        "description": "ASAN seems to make these tests overflow their stacks.",
-        "variant": "64",
-        "bug": "b/65189092",
-        "env_vars": {"SANITIZE_HOST": "address"}
-    },
-    {
         "tests": ["988-method-trace"],
         "variant": "redefine-stress | jvmti-stress",
         "description": "Test disabled due to redefine-stress disabling intrinsics which changes the trace output slightly."