backport 9291abc6337f8cf480806f4b2996ec905b021704

Author: GoeLin

test/hotspot/jtreg/runtime/Thread/TestAlwaysPreTouchStacks.java

@@ -100,7 +100,7 @@ public static void main(String[] args) throws Exception {
                 vmArgs.add("-XX:-UseMadvPopulateWrite");
             }
             Collections.addAll(vmArgs, "TestAlwaysPreTouchStacks", "test");
-            ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(vmArgs);
+            ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(vmArgs);
             OutputAnalyzer output = new OutputAnalyzer(pb.start());
             output.reportDiagnosticSummary();
 

test/hotspot/jtreg/runtime/cds/appcds/TestParallelGCWithCDS.java

@@ -116,8 +116,9 @@ static void test(boolean dumpWithParallel, boolean execWithParallel, boolean use
                 } else {
                     String pattern = "((Too small maximum heap)" +
                                      "|(GC triggered before VM initialization completed)" +
-                                     "|(java.lang.OutOfMemoryError: Java heap space)" +
-                                     "|(Initial heap size set to a larger value than the maximum heap size))";
+                                     "|(Initial heap size set to a larger value than the maximum heap size)" +
+                                     "|(java.lang.OutOfMemoryError)" +
+                                     "|(Error: A JNI error has occurred, please check your installation and try again))";
                     out.shouldMatch(pattern);
                     out.shouldNotHaveFatalError();
                 }

test/jdk/com/sun/jdi/ThreadMemoryLeakTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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,8 +26,9 @@
  * @bug 8297638
  * @summary JDI memory leak when creating and destroying many threads
  *
- * @comment Don't allow -Xcomp or -Xint as they impact memory useage and number of iterations
- * @requires (vm.compMode == "Xmixed")
+ * @comment Don't allow -Xcomp or -Xint as they impact memory useage and number of iterations.
+ *          Require compressed oops because not doing so increases memory usage.
+ * @requires (vm.compMode == "Xmixed") & vm.opt.final.UseCompressedOops
  * @run build TestScaffold VMConnection TargetListener TargetAdapter
  * @run compile -g ThreadMemoryLeakTest.java
  * @comment run with -Xmx7m so any leak will quickly produce OOME