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: cjplummer, sspitsyn
  • Loading branch information
Alex Menkov committed Oct 14, 2020
1 parent b7daf84 commit cd33abb
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
1 change: 1 addition & 0 deletions test/hotspot/jtreg/ProblemList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 @@ -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
*/

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

3 comments on commit cd33abb

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented on cd33abb Oct 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on cd33abb Jul 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RealCLanger Could not automatically backport cd33abb1 to openjdk/jdk11u-dev due to conflicts in the following files:

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

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b RealCLanger-backport-cd33abb1
$ git fetch --no-tags https://git.openjdk.org/jdk cd33abb136d415455090cef4fe6211d9e6940948
$ git cherry-pick --no-commit cd33abb136d415455090cef4fe6211d9e6940948
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport cd33abb136d415455090cef4fe6211d9e6940948'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport cd33abb136d415455090cef4fe6211d9e6940948.

Please sign in to comment.