OpenJDK / jdk / jdk
changeset 53718:066d23ce545e
8068225: nsk/jdi/EventQueue/remove_l/remove_l005 intermittently times out
Reviewed-by: cjplummer, sspitsyn
| author | gadams |
|---|---|
| date | Mon, 11 Feb 2019 07:19:32 -0500 |
| parents | f09d78e1fbfe |
| children | 3a56e823d843 |
| files | test/hotspot/jtreg/ProblemList.txt test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001.java test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/test/hotspot/jtreg/ProblemList.txt Mon Feb 11 12:12:41 2019 +0100 +++ b/test/hotspot/jtreg/ProblemList.txt Mon Feb 11 07:19:32 2019 -0500 @@ -164,7 +164,6 @@ vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003/TestDescription.java 8066993 generic-all vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java 8065773 generic-all vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java 8065773 generic-all -vmTestbase/nsk/jdi/EventQueue/remove_l/remove_l005/TestDescription.java 8068225 generic-all vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java 8208250 generic-all vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001.java Mon Feb 11 12:12:41 2019 +0100 +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachine/canBeModified/canbemodified001.java Mon Feb 11 07:19:32 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2019, 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 @@ -78,6 +78,7 @@ exitStatus = Consts.TEST_FAILED; e.printStackTrace(); } finally { + debugee.resume(); debugee.endDebugee(); } display("Test finished. exitStatus = " + exitStatus);
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java Mon Feb 11 12:12:41 2019 +0100 +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java Mon Feb 11 07:19:32 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2019, 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 @@ -557,6 +557,7 @@ * exit status code. */ public int endDebugee() { + int status = waitFor(); if (vm != null) { try { vm.dispose(); @@ -564,7 +565,7 @@ } vm = null; } - return waitFor(); + return status; } /*