Skip to content

Commit 909cef5

Browse files
author
Sonia Zaldana Calles
committed
8339891: Several sun/security/ssl/SSLSessionImpl/* tests override test.java.opts
Reviewed-by: lmesnik
1 parent 56a1877 commit 909cef5

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎test/jdk/sun/security/ssl/SSLEngineImpl/SSLEngineKeyLimit.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -109,8 +109,8 @@ public static void main(String args[]) throws Exception {
109109
}
110110
p.close();
111111

112-
System.setProperty("test.java.opts",
113-
"-Dtest.src=" + System.getProperty("test.src") +
112+
System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
113+
" -Dtest.src=" + System.getProperty("test.src") +
114114
" -Dtest.jdk=" + System.getProperty("test.jdk") +
115115
" -Djavax.net.debug=ssl,handshake" +
116116
" -Djava.security.properties=" + f.getName());

‎test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -65,8 +65,8 @@ public static void main(String[] args) throws Exception {
6565
sb.append(" ");
6666
});
6767
String params = sb.toString();
68-
System.setProperty("test.java.opts",
69-
"-Dtest.src=" + System.getProperty("test.src") +
68+
System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
69+
" -Dtest.src=" + System.getProperty("test.src") +
7070
" -Dtest.jdk=" + System.getProperty("test.jdk") +
7171
" -Dtest.root=" + System.getProperty("test.root") +
7272
" -Djavax.net.debug=ssl,handshake " + params

‎test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -51,8 +51,8 @@ public static void main(String[] args) throws Exception {
5151
StringBuilder sb = new StringBuilder();
5252
Arrays.stream(args).forEach(a -> sb.append(a).append(" "));
5353
String params = sb.toString();
54-
System.setProperty("test.java.opts",
55-
"-Dtest.src=" + System.getProperty("test.src") +
54+
System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
55+
" -Dtest.src=" + System.getProperty("test.src") +
5656
" -Dtest.jdk=" + System.getProperty("test.jdk") +
5757
" -Dtest.root=" + System.getProperty("test.root") +
5858
" -Djavax.net.debug=ssl,handshake " + params);

‎test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTParallel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -102,8 +102,8 @@ public static void main(String[] args) throws Exception {
102102
sb.append(" ").append(args[i]);
103103
}
104104
String params = sb.toString();
105-
System.setProperty("test.java.opts",
106-
"-Dtest.src=" + System.getProperty("test.src") +
105+
System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
106+
" -Dtest.src=" + System.getProperty("test.src") +
107107
" -Dtest.jdk=" + System.getProperty("test.jdk") +
108108
" -Dtest.root=" + System.getProperty("test.root") +
109109
" -Djavax.net.debug=ssl,handshake " +

‎test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTSequence.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -60,8 +60,8 @@ public static void main(String[] args) throws Exception {
6060
StringBuilder sb = new StringBuilder();
6161
Arrays.stream(args).forEach(a -> sb.append(a).append(" "));
6262
String params = sb.toString();
63-
System.setProperty("test.java.opts",
64-
"-Dtest.src=" + System.getProperty("test.src") +
63+
System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
64+
" -Dtest.src=" + System.getProperty("test.src") +
6565
" -Dtest.jdk=" + System.getProperty("test.jdk") +
6666
" -Dtest.root=" + System.getProperty("test.root") +
6767
" -Djavax.net.debug=ssl,handshake " + params

‎test/jdk/sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -179,8 +179,8 @@ SBListener doClientSide() throws Exception {
179179
public static void main(String[] args) throws Exception {
180180

181181
if (args.length == 0) {
182-
System.setProperty("test.java.opts",
183-
"-Dtest.src=" + System.getProperty("test.src") +
182+
System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
183+
" -Dtest.src=" + System.getProperty("test.src") +
184184
" -Dtest.jdk=" + System.getProperty("test.jdk") +
185185
" -Djavax.net.debug=ssl,handshake");
186186

‎test/jdk/sun/security/ssl/SSLSocketImpl/SSLSocketKeyLimit.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -125,8 +125,8 @@ public static void main(String args[]) throws Exception {
125125
}
126126
p.close();
127127
System.out.println("Keyusage path = " + f.getAbsolutePath());
128-
System.setProperty("test.java.opts",
129-
"-Dtest.src=" + System.getProperty("test.src") +
128+
System.setProperty("test.java.opts", System.getProperty("test.java.opts") +
129+
" -Dtest.src=" + System.getProperty("test.src") +
130130
" -Dtest.jdk=" + System.getProperty("test.jdk") +
131131
" -Djavax.net.debug=ssl,handshake" +
132132
" -Djava.security.properties=" + f.getName());

0 commit comments

Comments
 (0)