Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dtls merge fix #364

Closed
wants to merge 48 commits into from
Closed

Dtls merge fix #364

wants to merge 48 commits into from

Conversation

lutkerd
Copy link
Contributor

@lutkerd lutkerd commented May 10, 2024 •
edited
Loading

See the most recent commits.

Fixing the merge conflict from disabling DTLSv1.0. This pulls the SSLContextDefault.java tests from upstream, patches it to work with TLS1/1.1 enabled, then merges from upstream and updated the test again to expect DTLS 1.0 to be enabled.

make run-test TEST="test/jdk/sun/security/ssl/SSLContextImpl/SSLContextDefault.java"

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/jdk/sun/security/ssl/SSLContextImpl/SSLContextDefault.java
                                                         1     1     0     0   
==============================
TEST SUCCESS

GoeLin and others added 30 commits April 16, 2024 12:01
@GoeLin
8256660: Disable DTLS 1.0
b39a4d2 
Reviewed-by: mbaesken
Backport-of: 16744b34498e7aac59caef8c9b1a3d4d15f8c22e
@roberttoyonaga @jerboaa
8326529: JFR: Test for CompilerCompile events fails due to time out
8b8774d 
Backport-of: 4dd6c44cbdb0b5957414fa87b6c559fa4d6f2fa8
@GoeLin
Merge
e090f5c
8316164: Opensource JMenuBar manual test
85d891b 
Backport-of: 8f4dfc443ba5820f5799fff1418d6632d502d57b
8316017: Refactor timeout handler in PassFailJFrame
583477f 
Backport-of: 3abd772672a4dfd984459283235f3b1d8fb28a49
8318599: HttpURLConnection cache issues leading to crashes in JGSS w/…
6499067 
… native GSS introduced by 8303809

Backport-of: f1a24f6d4827f9b8648dd2afe6d606dab67d51fe
8297449: Update JInternalFrame Metal Border code
a33a174 
Reviewed-by: lucy
Backport-of: 09629570f5d064dc2a5cd670de8d648156ac3991
@MBaesken
8322783: prioritize /etc/os-release over /etc/SuSE-release in hs_err/…
215cf9b 
…info output

Reviewed-by: stuefe
Backport-of: 33af09083493940667958f951080e9d8700f784b
8302512: Update IANA Language Subtag Registry to Version 2023-02-14
cc23139 
Backport-of: 8210811b1924816da265da64da557111a2961e53
8304761: Update IANA Language Subtag Registry to Version 2023-03-22
7af75fb 
Backport-of: ae3aa7289a3de98001dde382f511b574b1d26c8d
8326006: Allow TEST_VM_FLAGLESS to set flagless mode
358a35a 
Backport-of: d10f277bd39bb5ac9bd48939c916de607fef8ace
8316242: Opensource SwingGraphics manual test
00f8277 
Backport-of: a57b9dab6c02c313f3975f47d502dae270c67508
8315824: Open source several Swing Text/HTML related tests
0be4705 
Backport-of: c11f8352e96a01b39e54080716030ec96f717cae
8316154: Opensource JTextArea manual tests
e1662fb 
Backport-of: 33c62e4fffe33a7593fd0c01de53507bfd01dc3b
8315741: Open source few swing JFormattedTextField and JPopupMenu tests
3f12da5 
Backport-of: bfbc41c1f177c7a2b8e91351ac41eaffaab2d8fc
8163921: HttpURLConnection default Accept header is malformed accordi…
295a8cd 
…ng to HTTP/1.1 RFC

Backport-of: 28796cbd1d15de678b80295418f5d1f9f59176a6
8302069: javax/management/remote/mandatory/notif/NotifReconnectDeadlo…
7491ed4 
…ckTest.java update

Backport-of: 1c7b09bc23ac37f83b9043de35b71bea7e814da5
8305874: Open source AWT Key, Text Event related tests
4ca2d02 
Backport-of: d6cf4aa1551df591c7bc75cb8c5e90d57630ca2a
8306634: Open source AWT Event related tests
f1687ea 
Backport-of: 9ed456fac87f598af7d71f9c0887234a09e10eed
8315071: Modify TrayIconScalingTest.java, PrintLatinCJKTest.java to u…
ff1b975 
…se new PassFailJFrame's builder pattern usage

Backport-of: 31e26814db5d5ad5018fb6ed2e8160e8a01938ab
8315609: Open source few more swing text/html tests
e73d88f 
Backport-of: a04c6c1ac663a1eab7d45913940cb6ac0af2c11c
8293965: Code signing warnings after JDK-8293550
533b458 
Backport-of: f91762f56ea7fb27b6fa54d07d3b3b0650bab0bc
8318854: [macos14] Running any AWT app prints Secure coding warning
6cce290 
Backport-of: 940f67c1a62c6f9462266f3a108649aca114cffa
8187759: Background not refreshed when painting over a transparent JF…
1ea1852 
…rame

Backport-of: 04d43c435d3ede519df169053dd9d724aa2312eb
8282017: sun/net/www/protocol/https/HttpsURLConnection/B6216082.java …
decacb8 
…fails with "SocketException: Unexpected end of file from server"

Reviewed-by: lucy
Backport-of: cd9a3cf05b2c200709103e2e8596414a62a1c441
8220202: Simplify/standardize method naming for HtmlTree
dabf4d1 
Reviewed-by: lucy
Backport-of: 1b9db9b7a131f7cf24b0ca64337ff61ad3544ef5
8306031: Update IANA Language Subtag Registry to Version 2023-04-13
f3d0f2b 
Reviewed-by: lucy
Backport-of: 261e45a973db0ad56b9ffe0901a63114a78a5e52
@GoeLin
8159927: Add a test to verify JMOD files created in the images do not…
7c04756 
… have debug symbols

Reviewed-by: lucy
Backport-of: 6c0bebccb0092d9726eb89a054e023e92edf7ca6
8255031: Update java/util/prefs/AddNodeChangeListener.java to report …
ac43e68 
…more failure info

Backport-of: 8afdcaee1ce28647dadffcdf41f938af0602d8f1
8324733: [macos14] Problem list tests which fail due to macOS bug des…
f29aa4d 
…cribed in JDK-8322653

Backport-of: d1e676360d5143cf12655ab1175a4a60bf402473
Amos Shi and others added 18 commits April 28, 2024 21:50
8327136: javax/management/remote/mandatory/notif/NotifReconnectDeadlo…
9df5688 
…ckTest.java fails on libgraal

Backport-of: 8f0fb27decec28f32e4d88341237189ba4a340fb
8306067: Open source AWT Graphics,GridBagLayout related tests
d8b297f 
8306838: GetGraphicsTest needs to be headful

Backport-of: cb32c8221a1f0f30300813a49b03cf2838bbbf01
8294137: Review running times of java.math tests
1e1688a 
Backport-of: 51035a75e493f64b26f78e7fc87f6f6e536e4f56
8315889: Open source several Swing HTMLDocument related tests
f7d0522 
Backport-of: 8f46abc938ffe338e25d5fdbdcfa0aaa12edfa58
8318809: java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java sho…
81f2413 
…ws intermittent failures on linux ppc64le and aarch64

Backport-of: 50d1839d54f13631946925d8ecf03ce71f31bab8
@mrserb
8328194: Add a test to check default rendering engine
9363095 
Backport-of: c013fa18119bbd2e355d5c0d13cd8c172892800a
8263940: NPE when creating default file system when default file syst…
d42634b 
…em provider is packaged as JAR file on class path

Reviewed-by: lucy, goetz
Backport-of: 717792c3b728584413572e7aede83290779be2a2
8308021: Update IANA Language Subtag Registry to Version 2023-05-11
137a8b9 
Backport-of: b96339f5e38c2c0e2f3d894d77d29554052cb1f1
@roberttoyonaga @jerboaa
8305931: jdk/jfr/jcmd/TestJcmdDumpPathToGCRoots.java failed with "Exp…
cabaf74 
…ected chains but found none"

Backport-of: 65be5e0c547d74ca7de288b164aa9bd6d6855685
8295343: sun/security/pkcs11 tests fail on Linux RHEL 8.6 and newer
1da8fd8 
8231351: Add notes for PKCS11 tests in the test doc

Reviewed-by: lucy
Backport-of: 6ce0ebb858d3112f136e12d3ad595f805f6871a0
8310818: Refactor more Locale tests to use JUnit
3f636f3 
Reviewed-by: lucy
Backport-of: 989e0bfe59d67f6a751e8b187caabbd0fd8c8f81
@RealCLanger
8331643: [11u]: Bump GHA bootstrap JDK to 11.0.23
b7822c3 
Reviewed-by: sgehwolf
@RealCLanger
8293563: [macos-aarch64] SA core file tests failing with sun.jvm.hots…
4202063 
…pot.oops.UnknownOopException

Reviewed-by: mbaesken
Backport-of: 5eeb41a7294f56bc258a154c043bc540cb8de5c4
@RealCLanger
8325579: Inconsistent behavior in com.sun.jndi.ldap.Connection::creat…
c542dc9 
…eSocket

Reviewed-by: mbaesken
Backport-of: 32bf1f4169fd07291d608323c143832ad48e531e
@lutkerd
Pick SSLContextDefault tests from upstream
aa24df1
@lutkerd
Remove disable of TLSv1/1.1 from test
f8966bd
@lutkerd
Merge upstream into develop
e8db46f
@lutkerd
Remove disable of DTLSv1.0 from test
65999a9
@lutkerd lutkerd requested review from alvdavi and mrserb May 10, 2024 17:37
@mrserb
Copy link
Contributor

mrserb commented May 13, 2024

I am not sure how to review the changes in 500 files in 133 commits

@lutkerd
Copy link
Contributor Author

lutkerd commented May 13, 2024

I understand, I can try to merge everything up the the point merges starting failing and see if that makes it easier.
The thing I am changing are just the 4 commits at the end and everything else should be a merge from upstream.

@lutkerd lutkerd closed this May 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alvdavi alvdavi Awaiting requested review from alvdavi

@mrserb mrserb Awaiting requested review from mrserb

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@lutkerd @mrserb @GoeLin @roberttoyonaga @MBaesken @RealCLanger