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.

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

Merge master HEAD into openj9-staging #526

Merged
merged 23 commits into from
Dec 1, 2022

Conversation

JasonFengJ9
Copy link
Member

Resolved conflicts:

	test/jdk/java/foreign/TestMatrix.java
	test/jdk/java/foreign/malloc/TestMixedMallocFree.java

Signed-off-by: Jason Feng fengj@ca.ibm.com

mrserb and others added 23 commits November 30, 2022 03:22
…s not cleared instead inserted characters replaced with unicode null characters

Reviewed-by: prr, aivanov
…g thrown from HttpURLConnection

Reviewed-by: dfuchs, jpai
…bad address

Co-authored-by: Andrew Haley <aph@openjdk.org>
Reviewed-by: aph, kvn
Co-authored-by: Kim Barrett <kbarrett@openjdk.org>
Reviewed-by: kbarrett
Co-authored-by: Michael Ernst <mernst@openjdk.org>
Reviewed-by: kevinw, dholmes, sspitsyn
… Can't disable vthread end events, jvmtiError=JVMTI_ERROR_WRONG_PHASE(112)"

Reviewed-by: amenkov, dcubed, lmesnik, sspitsyn
…adCount tests

Reviewed-by: dholmes, lmesnik, kevinw, sspitsyn
8291642: java/foreign/TestMatrix.java -few tests are failing due to JDK-8287158.

Reviewed-by: mcimadamore
Conflicts:
	test/jdk/java/foreign/TestMatrix.java
	test/jdk/java/foreign/malloc/TestMixedMallocFree.java

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
@JasonFengJ9
Copy link
Member Author

There are new tests added at test/jdk/java/foreign/TestMatrix.java, we might have to check if they can be applied to os.arch == "ppc64" | os.arch == "ppc64le" | os.arch == "s390x".

FYI @ChengJin01

@keithc-ca keithc-ca merged commit 685fd3f into ibmruntimes:openj9-staging Dec 1, 2022
@JasonFengJ9 JasonFengJ9 deleted the mergetmp branch December 1, 2022 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.