Skip to content

Commit

Permalink
8249623: test @Ignore-d due to 7013634 should be returned back to exe…
Browse files Browse the repository at this point in the history
…cution

Reviewed-by: mdoerr
Backport-of: cd33abb
  • Loading branch information
RealCLanger committed Jul 19, 2022
1 parent 2dc4088 commit 805a031
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions test/hotspot/jtreg/ProblemList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all

vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/TestDescription.java 8016181 generic-all
vmTestbase/nsk/jvmti/FieldModification/fieldmod001/TestDescription.java 8016181 generic-all
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestDescription.java 7013634 generic-all
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestDescription.java 8253916 linux-all
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003/TestDescription.java 6606767 generic-all
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004/TestDescription.java 7013634,6606767 generic-all
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004/TestDescription.java 6606767 generic-all
vmTestbase/nsk/jvmti/ThreadStart/threadstart001/TestDescription.java 8016181 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS102/hs102t002/TestDescription.java 8204506,8203350 generic-all
vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t001/hs204t001.java 6813266 generic-all
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2020, 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 @@ -27,6 +27,7 @@

import nsk.share.Consts;
import nsk.share.test.Stresser;
import jtreg.SkippedException;

public class resexhausted001 {
static {
Expand Down Expand Up @@ -56,15 +57,15 @@ public static int run(String args[], PrintStream out) {
}

System.out.println("Can't reproduce OOME due to a limit on iterations/execution time. Test was useless.");
return Consts.TEST_PASSED;
throw new SkippedException("Test did not get an OutOfMemory error");

} catch (OutOfMemoryError e) {
count = threadCount.get();
} finally {
threadsDone = true;
synchronized (hanger) {
hanger.notifyAll();
}
} finally {
stress.finish();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,10 @@
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @ignore 7013634
* @run main/othervm/native
* @run main/othervm/native/timeout=240
* -agentlib:resexhausted=-waittime=5
* -XX:-UseGCOverheadLimit
* nsk.jvmti.ResourceExhausted.resexhausted001
* -stressTime 1200
* -stressTime 220
*/

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2020, 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 All @@ -26,6 +26,7 @@
import java.io.PrintStream;
import nsk.share.Consts;
import nsk.share.test.Stresser;
import jtreg.SkippedException;

public class resexhausted002 {
static final long MAX_ITERATIONS = Long.MAX_VALUE;
Expand Down Expand Up @@ -55,7 +56,7 @@ public static int run(String args[], PrintStream out) {
}

System.out.println("Can't reproduce OOME due to a limit on iterations/execution time. Test was useless.");
return Consts.TEST_PASSED;
throw new SkippedException("Test did not get an OutOfMemory error");

} catch (OutOfMemoryError e) {
} finally {
Expand Down

1 comment on commit 805a031

@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.