From b8c7b5c8c37b0c8184742c529d26fa91b973c344 Mon Sep 17 00:00:00 2001 From: Korov Date: Sun, 20 Jul 2025 14:26:52 +0800 Subject: [PATCH 1/3] 8362658: sun/security/ssl/SSLEngineImpl/* tests duplicate jvm flags --- test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java | 3 +-- test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java | 2 +- .../security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java | 2 +- test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTParallel.java | 2 +- test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTSequence.java | 2 +- .../ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java | 2 +- test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java | 3 +-- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java b/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java index 65311e9770154..4ef76ba478d94 100644 --- a/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java +++ b/test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java @@ -119,8 +119,7 @@ public static void main(String args[]) throws Exception { System.getProperty("test.java.opts")); ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder( - Utils.addTestJavaOpts("SSLEngineKeyLimit", "p", args[1], - args[2])); + "SSLEngineKeyLimit", "p", args[1], args[2]); OutputAnalyzer output = ProcessTools.executeProcess(pb); try { diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java index d6cdbf2e015d4..2165fb89f670b 100644 --- a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java +++ b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java @@ -78,7 +78,7 @@ public static void main(String[] args) throws Exception { System.getProperty("test.java.opts")); ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder( - Utils.addTestJavaOpts("MultiNSTClient", "p")); + "MultiNSTClient", "p"); OutputAnalyzer output = ProcessTools.executeProcess(pb); boolean pass = true; diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java index 41f6ec0ada4ea..13392e837a00c 100644 --- a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java +++ b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java @@ -61,7 +61,7 @@ public static void main(String[] args) throws Exception { System.getProperty("test.java.opts")); ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder( - Utils.addTestJavaOpts("MultiNSTNoSessionCreation", "p")); + "MultiNSTNoSessionCreation", "p"); OutputAnalyzer output = ProcessTools.executeProcess(pb); try { diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTParallel.java b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTParallel.java index 32ee7db7b4b90..56afc8db50c61 100644 --- a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTParallel.java +++ b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTParallel.java @@ -117,7 +117,7 @@ public static void main(String[] args) throws Exception { System.getProperty("test.java.opts")); ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder( - Utils.addTestJavaOpts("MultiNSTParallel", "p")); + "MultiNSTParallel", "p"); OutputAnalyzer output = ProcessTools.executeProcess(pb); try { diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTSequence.java b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTSequence.java index 125b006055b68..6704d266a34e4 100644 --- a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTSequence.java +++ b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTSequence.java @@ -70,7 +70,7 @@ public static void main(String[] args) throws Exception { System.getProperty("test.java.opts")); ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder( - Utils.addTestJavaOpts("MultiNSTSequence", "p")); + "MultiNSTSequence", "p"); OutputAnalyzer output = ProcessTools.executeProcess(pb); boolean pass = true; diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java index 87db7eed2963d..17a4afdc77e0e 100644 --- a/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java +++ b/test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java @@ -188,7 +188,7 @@ public static void main(String[] args) throws Exception { System.getProperty("test.java.opts")); ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder( - Utils.addTestJavaOpts("ResumptionUpdateBoundValues", "p")); + "ResumptionUpdateBoundValues", "p"); OutputAnalyzer output = ProcessTools.executeProcess(pb); try { diff --git a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java index fc26b60e4d45d..3d21db5954898 100644 --- a/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java +++ b/test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java @@ -135,8 +135,7 @@ public static void main(String args[]) throws Exception { System.getProperty("test.java.opts")); ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder( - Utils.addTestJavaOpts("SSLSocketKeyLimit", "p", args[1], - args[2])); + "SSLSocketKeyLimit", "p", args[1], args[2]); OutputAnalyzer output = ProcessTools.executeProcess(pb); try { From 931db213d453aa49242e41b340ea391b9eaf5a49 Mon Sep 17 00:00:00 2001 From: Korov Date: Sun, 20 Jul 2025 14:29:36 +0800 Subject: [PATCH 2/3] 8362658: sun/security/ssl/SSLEngineImpl/* tests duplicate jvm flags --- test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java index 2165fb89f670b..4772013b36eec 100644 --- a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java +++ b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java @@ -78,7 +78,7 @@ public static void main(String[] args) throws Exception { System.getProperty("test.java.opts")); ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder( - "MultiNSTClient", "p"); + "MultiNSTClient", "p"); OutputAnalyzer output = ProcessTools.executeProcess(pb); boolean pass = true; From 52cb033cddd8f33351493e8af008cb86bac91beb Mon Sep 17 00:00:00 2001 From: Lei Zhu Date: Mon, 21 Jul 2025 19:55:31 +0800 Subject: [PATCH 3/3] Update full name