8295424: adjust timeout for another JLI GetObjectSizeIntrinsicsTest.j…

…ava subtest 8297367: disable TestRedirectLinks.java in slowdebug mode Backport-of: 6e5470525d5236901c219146f363d4860e6b8008
openjdk · Oct 3, 2023 · ceafbb7 · ceafbb7 · openjdk-notifier · Oct 3, 2023
1 parent 26fb0f8
commit ceafbb7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java b/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
@@ -288,7 +288,7 @@
  *                   -Xbatch -XX:TieredStopAtLevel=1
  *                   -javaagent:basicAgent.jar GetObjectSizeIntrinsicsTest GetObjectSizeIntrinsicsTest large
  *
- * @run main/othervm -Xmx8g
+ * @run main/othervm/timeout=180 -Xmx8g
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure -XX:+WhiteBoxAPI -Xbootclasspath/a:.
  *                   -Xbatch -XX:-TieredCompilation
  *                   -javaagent:basicAgent.jar GetObjectSizeIntrinsicsTest GetObjectSizeIntrinsicsTest large

diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java
@@ -26,11 +26,14 @@
  * @bug 8190312
  * @summary test redirected URLs for -link
  * @library /tools/lib ../../lib
+ * @library /test/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.javadoc/jdk.javadoc.internal.api
  *          jdk.javadoc/jdk.javadoc.internal.tool
  * @build toolbox.ToolBox toolbox.JavacTask javadoc.tester.*
+ * @build jtreg.SkippedException
+ * @build jdk.test.lib.Platform
  * @run main TestRedirectLinks
  */
 
@@ -66,12 +69,18 @@
 import toolbox.JavacTask;
 import toolbox.ToolBox;
 
+import jdk.test.lib.Platform;
+import jtreg.SkippedException;
+
 public class TestRedirectLinks extends JavadocTester {
     /**
      * The entry point of the test.
      * @param args the array of command line arguments.
      */
     public static void main(String... args) throws Exception {
+        if (Platform.isSlowDebugBuild()) {
+            throw new SkippedException("Test is unstable with slowdebug bits");
+        }
         TestRedirectLinks tester = new TestRedirectLinks();
         tester.runTests();
     }