Skip to content

Commit ceafbb7

Browse files
committed
8295424: adjust timeout for another JLI GetObjectSizeIntrinsicsTest.java subtest
8297367: disable TestRedirectLinks.java in slowdebug mode Backport-of: 6e5470525d5236901c219146f363d4860e6b8008
1 parent 26fb0f8 commit ceafbb7

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
* -Xbatch -XX:TieredStopAtLevel=1
289289
* -javaagent:basicAgent.jar GetObjectSizeIntrinsicsTest GetObjectSizeIntrinsicsTest large
290290
*
291-
* @run main/othervm -Xmx8g
291+
* @run main/othervm/timeout=180 -Xmx8g
292292
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure -XX:+WhiteBoxAPI -Xbootclasspath/a:.
293293
* -Xbatch -XX:-TieredCompilation
294294
* -javaagent:basicAgent.jar GetObjectSizeIntrinsicsTest GetObjectSizeIntrinsicsTest large

test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@
2626
* @bug 8190312
2727
* @summary test redirected URLs for -link
2828
* @library /tools/lib ../../lib
29+
* @library /test/lib
2930
* @modules jdk.compiler/com.sun.tools.javac.api
3031
* jdk.compiler/com.sun.tools.javac.main
3132
* jdk.javadoc/jdk.javadoc.internal.api
3233
* jdk.javadoc/jdk.javadoc.internal.tool
3334
* @build toolbox.ToolBox toolbox.JavacTask javadoc.tester.*
35+
* @build jtreg.SkippedException
36+
* @build jdk.test.lib.Platform
3437
* @run main TestRedirectLinks
3538
*/
3639

@@ -66,12 +69,18 @@
6669
import toolbox.JavacTask;
6770
import toolbox.ToolBox;
6871

72+
import jdk.test.lib.Platform;
73+
import jtreg.SkippedException;
74+
6975
public class TestRedirectLinks extends JavadocTester {
7076
/**
7177
* The entry point of the test.
7278
* @param args the array of command line arguments.
7379
*/
7480
public static void main(String... args) throws Exception {
81+
if (Platform.isSlowDebugBuild()) {
82+
throw new SkippedException("Test is unstable with slowdebug bits");
83+
}
7584
TestRedirectLinks tester = new TestRedirectLinks();
7685
tester.runTests();
7786
}

0 commit comments

Comments
 (0)