8249623: test @ignore-d due to 7013634 should be returned back to execution

Reviewed-by: cjplummer, sspitsyn
This commit is contained in:
Alex Menkov 2020-10-14 17:49:42 +00:00
parent b7daf8427b
commit cd33abb136
4 changed files with 10 additions and 8 deletions

View File

@ -130,6 +130,7 @@ vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
vmTestbase/metaspace/gc/firstGC_99m/TestDescription.java 8208250 generic-all
vmTestbase/metaspace/gc/firstGC_default/TestDescription.java 8208250 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 6606767 generic-all
vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 generic-all

View File

@ -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
@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import nsk.share.Consts;
import nsk.share.test.Stresser;
import jtreg.SkippedException;
public class resexhausted001 {
static {
@ -56,15 +57,15 @@ public class resexhausted001 {
}
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();
}

View File

@ -37,11 +37,10 @@
*
* @library /vmTestbase
* /test/lib
* @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
*/

View File

@ -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
@ -26,6 +26,7 @@ package nsk.jvmti.ResourceExhausted;
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;
@ -55,7 +56,7 @@ public class resexhausted002 {
}
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 {