Skip to content

Commit

Permalink
8232839: JDI AfterThreadDeathTest.java failed due to "FAILED: Did not…
Browse files Browse the repository at this point in the history
… get expected IllegalThreadStateException on a StepRequest.enable()"

Backport-of: 84184f947342fd1adbe4e3f2230ce3de4ae6007e
  • Loading branch information
GoeLin committed Oct 10, 2023
1 parent edc15aa commit ac6d84c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 13 deletions.
2 changes: 0 additions & 2 deletions test/jdk/ProblemList.txt
Expand Up @@ -707,8 +707,6 @@ com/sun/jdi/RepStep.java 8043571 generic-

com/sun/jdi/InvokeHangTest.java 8218463 linux-all

com/sun/jdi/AfterThreadDeathTest.java 8232839 linux-all

############################################################################

# jdk_time
Expand Down
32 changes: 21 additions & 11 deletions test/jdk/com/sun/jdi/AfterThreadDeathTest.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
Expand Down Expand Up @@ -51,9 +51,9 @@ public static void main(String[] args){
public class AfterThreadDeathTest extends TestScaffold {
ReferenceType targetClass;
ThreadReference mainThread;
StepRequest stepRequest = null;
EventRequestManager erm;
boolean mainIsDead;
volatile boolean mainIsDead = false;
volatile boolean gotExpectedThreadStart = false;

AfterThreadDeathTest (String args[]) {
super(args);
Expand All @@ -68,20 +68,23 @@ public static void main(String[] args) throws Exception {
public void threadStarted(ThreadStartEvent event) {
println("Got ThreadStartEvent: " + event);

if (stepRequest != null) {
erm.deleteEventRequest(stepRequest);
stepRequest = null;
println("Deleted stepRequest");
// We don't want to attempt the StepRequest.enable() until we recieve
// the ThreadStartEvent for the "DestroyJavaVM" thread. See JDK-8232839.
if (!event.thread().name().equals("DestroyJavaVM")) {
return;
}
gotExpectedThreadStart = true;

if (mainIsDead) {
if (!mainIsDead) {
failure("FAILED: Got expected ThreadStartEvent before \"main\" ThreadDeathEvent");
} else {
// Here is the odd thing about this test; whatever thread this event
// is for, we do a step on the mainThread. If the mainThread is
// already dead, we should get the exception. Note that we don't
// come here for the start of the main thread.
stepRequest = erm.createStepRequest(mainThread,
StepRequest.STEP_LINE,
StepRequest.STEP_OVER);
StepRequest stepRequest = erm.createStepRequest(mainThread,
StepRequest.STEP_LINE,
StepRequest.STEP_OVER);
stepRequest.addCountFilter(1);
stepRequest.setSuspendPolicy (EventRequest.SUSPEND_ALL);
try {
Expand Down Expand Up @@ -146,6 +149,13 @@ protected void runTests() throws Exception {
*/
listenUntilVMDisconnect();

if (!gotExpectedThreadStart) {
failure("FAILED: never got expected ThreadStartEvent");
}
if (!mainIsDead) {
failure("FAILED: never got ThreadDeathEvent for \"main\" thread");
}

/*
* deal with results of test
* if anything has called failure("foo") testFailed will be true
Expand Down

1 comment on commit ac6d84c

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.