Skip to content

Commit cd33abb

Browse files
author
Alex Menkov
committed
8249623: test @Ignore-d due to 7013634 should be returned back to execution
Reviewed-by: cjplummer, sspitsyn
1 parent b7daf84 commit cd33abb

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

test/hotspot/jtreg/ProblemList.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
130130
vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all
131131
vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 generic-all
132132

133+
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestDescription.java 8253916 linux-all
133134
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted003/TestDescription.java 6606767 generic-all
134135
vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted004/TestDescription.java 6606767 generic-all
135136
vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 generic-all

test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
2727

2828
import nsk.share.Consts;
2929
import nsk.share.test.Stresser;
30+
import jtreg.SkippedException;
3031

3132
public class resexhausted001 {
3233
static {
@@ -56,15 +57,15 @@ public static int run(String args[], PrintStream out) {
5657
}
5758

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

6162
} catch (OutOfMemoryError e) {
6263
count = threadCount.get();
64+
} finally {
6365
threadsDone = true;
6466
synchronized (hanger) {
6567
hanger.notifyAll();
6668
}
67-
} finally {
6869
stress.finish();
6970
}
7071

test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestDescription.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@
3737
*
3838
* @library /vmTestbase
3939
* /test/lib
40-
* @ignore 7013634
41-
* @run main/othervm/native
40+
* @run main/othervm/native/timeout=240
4241
* -agentlib:resexhausted=-waittime=5
4342
* -XX:-UseGCOverheadLimit
4443
* nsk.jvmti.ResourceExhausted.resexhausted001
45-
* -stressTime 1200
44+
* -stressTime 220
4645
*/
4746

test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted002.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
2626
import java.io.PrintStream;
2727
import nsk.share.Consts;
2828
import nsk.share.test.Stresser;
29+
import jtreg.SkippedException;
2930

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

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

6061
} catch (OutOfMemoryError e) {
6162
} finally {

0 commit comments

Comments
 (0)