stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8294881: test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003/TestDescription.java fails

Browse Source 
Reviewed-by: cjplummer, sspitsyn
This commit is contained in:
Leonid Mesnik 2022-11-15 17:19:48 +00:00
parent 6aef3a4a3d
commit 216c6f6340
5 changed files with 63 additions and 12 deletions
test/hotspot/jtreg/vmTestbase/nsk
jdi/VirtualMachine/dispose
dispose002a.javadispose003a.javadispose004a.javadispose005a.java
share/jdi
JDIUtils.java

7
test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose002a.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2022, 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
@ -133,8 +133,9 @@ public class dispose002a {
}
break;
} else if (instruction.equals("check_alive")) {
log1("checking on: thread2.isAlive");
if (test_thread.isAlive()) {
log1("checking if thread2 completed");
if (!JDIUtils.waitForCompletion(test_thread)) {
log1("thread2 is alive after vm.dispose().");
pipe.println("alive");
test_thread.interrupt();
} else {

8
test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose003a.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2022, 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
@ -135,9 +135,11 @@ public class dispose003a {
break;
} else if (instruction.equals("check_alive")) {
log1("checking on: thread2.isAlive");
if (test_thread.isAlive()) {
test_thread.resume();
if (!JDIUtils.waitForCompletion(test_thread)) {
pipe.println("alive");
logErr("ERROR thread is alive after vm.dispose()");
exitCode = FAILED;
break;
} else {
pipe.println("not_alive");
}

8
test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose004a.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2022, 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
@ -136,9 +136,11 @@ public class dispose004a {
break;
} else if (instruction.equals("check_alive")) {
log1("checking on: thread2.isAlive");
if (test_thread.isAlive()) {
test_thread.resume();
if (!JDIUtils.waitForCompletion(test_thread)) {
pipe.println("alive");
logErr("ERROR thread is alive after vm.dispose()");
exitCode = FAILED;
break;
} else {
pipe.println("not_alive");
}

8
test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/dispose/dispose005a.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2022, 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
@ -152,10 +152,12 @@ public class dispose005a {
logErr("ERROR: unexpected instruction: " + instruction);
exitCode = FAILED;
} else {
log1("checking on: testedThread.isAlive");
log1("checking on: test_thread.done");
if (!test_thread.done) {
test_thread.resume();
pipe.println("alive");
logErr("ERROR test_thread.done is false after vm.dispose()");
exitCode = FAILED;
break;
} else {
pipe.println("not_alive");
}

44
test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIUtils.java Normal file

@ -0,0 +1,44 @@
/*
* Copyright (c) 2022, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package nsk.share.jdi;
public class JDIUtils {
/*
* Wait until thread is no longer alive, but only wait
* for a short period of time since it shouldn't take long.
*/
public static boolean waitForCompletion(Thread thread) {
for (int attempt = 1; attempt <= 5; attempt++) {
if (!thread.isAlive()) {
return true;
}
try {
Thread.sleep(attempt * 1000);
} catch (InterruptedException ie) {
}
}
return false;
}
}