From 16ab7bfe22b96ec8c4b7b7197d55fa41d36e3875 Mon Sep 17 00:00:00 2001 From: Chris Plummer Date: Tue, 6 Jun 2023 18:34:18 +0000 Subject: [PATCH] 8309505: com/sun/jdi/MethodEntryExitEvents.java due to finding wrong main thread Reviewed-by: amenkov, sspitsyn --- test/jdk/ProblemList-Virtual.txt | 1 - test/jdk/com/sun/jdi/MethodEntryExitEvents.java | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/jdk/ProblemList-Virtual.txt b/test/jdk/ProblemList-Virtual.txt index f844b2f5492..f7ae4bde195 100644 --- a/test/jdk/ProblemList-Virtual.txt +++ b/test/jdk/ProblemList-Virtual.txt @@ -29,7 +29,6 @@ com/sun/jdi/EATests.java#id0 8264699 generic- com/sun/jdi/ExceptionEvents.java 8278470 generic-all com/sun/jdi/JdbMethodExitTest.java 8285422 generic-all -com/sun/jdi/MethodEntryExitEvents.java 8285422 generic-all com/sun/jdi/RedefineCrossStart.java 8278470 generic-all com/sun/jdi/RedefineNestmateAttr/TestNestmateAttr.java 8285422 generic-all com/sun/jdi/ReferrersTest.java 8285422 generic-all diff --git a/test/jdk/com/sun/jdi/MethodEntryExitEvents.java b/test/jdk/com/sun/jdi/MethodEntryExitEvents.java index 5901546614b..abdb0ff7c75 100644 --- a/test/jdk/com/sun/jdi/MethodEntryExitEvents.java +++ b/test/jdk/com/sun/jdi/MethodEntryExitEvents.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -95,10 +95,10 @@ public class MethodEntryExitEvents extends TestScaffold { boolean finishedCounting = false; /* - * Enter main() , then t2., then sayHello[1,2,3,4,5] 15 times 3 loops, + * main() is already entered, so add t2., then sayHello[1,2,3,4,5] 15 times 3 loops, * then loopComplete() */ - final int expectedEntryCount = 1 + 1 + (15 * 3) + 1; + final int expectedEntryCount = 1 + (15 * 3) + 1; int methodEntryCount = 0; /* @@ -220,8 +220,9 @@ public class MethodEntryExitEvents extends TestScaffold { waitForVMStart(); // Determine main thread - ClassPrepareEvent e = resumeToPrepareOf("MethodEntryExitEventsDebugee"); - mainThread = e.thread(); + BreakpointEvent bpe = resumeTo("MethodEntryExitEventsDebugee", + "main", "([Ljava/lang/String;)V");; + mainThread = bpe.thread(); try {