diff options
| -rw-r--r-- | test/1923-frame-pop/src/art/Test1923.java | 21 | ||||
| -rw-r--r-- | test/1924-frame-pop-toggle/src/art/Test1924.java | 20 | ||||
| -rw-r--r-- | test/knownfailures.json | 10 |
3 files changed, 25 insertions, 26 deletions
diff --git a/test/1923-frame-pop/src/art/Test1923.java b/test/1923-frame-pop/src/art/Test1923.java index b5265b7e9d..6f41540259 100644 --- a/test/1923-frame-pop/src/art/Test1923.java +++ b/test/1923-frame-pop/src/art/Test1923.java @@ -157,14 +157,19 @@ public class Test1923 { 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); diff --git a/test/1924-frame-pop-toggle/src/art/Test1924.java b/test/1924-frame-pop-toggle/src/art/Test1924.java index 0ffbfc621c..f0bb68c3cf 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 class Test1924 { 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); diff --git a/test/knownfailures.json b/test/knownfailures.json index df7544e6e0..20cfc34e43 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." |