2021-04-19 19:31:47 +08:00
|
|
|
From 696532135fb7dc62f4356531b6047d0620149447 Mon Sep 17 00:00:00 2001
|
|
|
|
|
Date: Fri, 16 Apr 2021 11:26:40 +0800
|
|
|
|
|
Subject: [PATCH 1/3] add missing test case
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
.../java/testlibrary/OutputAnalyzer.java | 2 +-
|
|
|
|
|
.../lookup/TestDefenderMethodLookup.java | 2 +
|
|
|
|
|
.../com/huawei/openjdk/TestAdaptiveHeap.java | 42 +++++++++++++++++++
|
|
|
|
|
version.txt | 1 +
|
2023-01-28 14:19:32 +08:00
|
|
|
8 files changed, 51 insertions(+), 3 deletions(-)
|
2021-04-19 19:31:47 +08:00
|
|
|
create mode 100644 test/jdk/com/huawei/openjdk/TestAdaptiveHeap.java
|
|
|
|
|
create mode 100644 version.txt
|
|
|
|
|
|
|
|
|
|
diff --git a/hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java b/hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java
|
|
|
|
|
index 2132325f..2221ea4a 100644
|
|
|
|
|
--- a/hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java
|
|
|
|
|
+++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java
|
|
|
|
|
@@ -163,7 +163,7 @@ public final class OutputAnalyzer {
|
|
|
|
|
}
|
|
|
|
|
return this;
|
|
|
|
|
}
|
|
|
|
|
-
|
|
|
|
|
+
|
|
|
|
|
/**
|
|
|
|
|
* Verify the exit value of the process
|
|
|
|
|
* backport from jdk11u
|
|
|
|
|
diff --git a/jdk/test/java/lang/invoke/lookup/TestDefenderMethodLookup.java b/jdk/test/java/lang/invoke/lookup/TestDefenderMethodLookup.java
|
|
|
|
|
index 2ee40289..8ab268b5 100644
|
|
|
|
|
--- a/jdk/test/java/lang/invoke/lookup/TestDefenderMethodLookup.java
|
|
|
|
|
+++ b/jdk/test/java/lang/invoke/lookup/TestDefenderMethodLookup.java
|
|
|
|
|
@@ -1,6 +1,8 @@
|
|
|
|
|
/*
|
|
|
|
|
* @test
|
2023-10-25 17:18:42 +08:00
|
|
|
+ * @author zl
|
2021-04-19 19:31:47 +08:00
|
|
|
* @bug 8203699
|
|
|
|
|
+ * @summary see https://code.huawei.com/HuaweiJDK/JVM-team/JVM/issues/1368
|
|
|
|
|
* @run testng/othervm test.java.lang.invoke.lookup.TestDefenderMethodLookup
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
diff --git a/test/jdk/com/huawei/openjdk/TestAdaptiveHeap.java b/test/jdk/com/huawei/openjdk/TestAdaptiveHeap.java
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 00000000..bd22ba83
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/test/jdk/com/huawei/openjdk/TestAdaptiveHeap.java
|
|
|
|
|
@@ -0,0 +1,42 @@
|
|
|
|
|
+package com.huawei.openjdk.adaptiveheap;
|
|
|
|
|
+ /**
|
|
|
|
|
+ * @test TestAdaptiveHeap.java
|
|
|
|
|
+ * @key gc
|
|
|
|
|
+ * @library /testlibrary
|
|
|
|
|
+ * @build com.huawei.openjdk.adaptiveheap.TestAdaptiveHeap
|
|
|
|
|
+ * @run main/othervm com.huawei.openjdk.adaptiveheap.TestAdaptiveHeap -Xms16G -Xmx16G -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1PeriodicGCLoadThreshold=20 -XX:G1PeriodicGCInterval=15000 -XX:+G1Uncommit
|
|
|
|
|
+ * @summary test adaptheap
|
2023-10-25 17:18:42 +08:00
|
|
|
+ * @author wrs
|
2021-04-19 19:31:47 +08:00
|
|
|
+ */
|
|
|
|
|
+
|
|
|
|
|
+import com.oracle.java.testlibrary.OutputAnalyzer;
|
|
|
|
|
+import com.oracle.java.testlibrary.ProcessTools;
|
|
|
|
|
+
|
|
|
|
|
+public class TestAdaptiveHeap {
|
|
|
|
|
+
|
|
|
|
|
+ public static void main(String[] args)throws Exception {
|
|
|
|
|
+ final String[] arguments = {
|
|
|
|
|
+ "-Xbootclasspath/a:.",
|
|
|
|
|
+ "-Xmx16G",
|
|
|
|
|
+ ExeTest.class.getName(),
|
|
|
|
|
+ args[0],
|
|
|
|
|
+ args[1],
|
|
|
|
|
+ args[2],
|
|
|
|
|
+ args[3],
|
|
|
|
|
+ args[4],
|
|
|
|
|
+ args[5],
|
|
|
|
|
+ args[6]
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(arguments);
|
|
|
|
|
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
|
|
|
|
|
+ output.shouldHaveExitValue(0);
|
|
|
|
|
+ System.out.println();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ private static class ExeTest {
|
|
|
|
|
+ public static void main(String[] str){
|
|
|
|
|
+ System.out.println();
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+}
|
|
|
|
|
diff --git a/version.txt b/version.txt
|
|
|
|
|
new file mode 100644
|
|
|
|
|
index 00000000..9b614024
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ b/version.txt
|
|
|
|
|
@@ -0,0 +1 @@
|
2025-02-27 16:26:50 +08:00
|
|
|
+8.442.8.0.13
|
2021-04-19 19:31:47 +08:00
|
|
|
--
|
|
|
|
|
2.23.0
|
|
|
|
|
|