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

Check file type for shared class cache jar files #19380

Merged
merged 1 commit into from
May 24, 2024
Merged

Check file type for shared class cache jar files #19380

merged 1 commit into from
May 24, 2024

Conversation

theresa-m
Copy link
Contributor

Use the port library to check if path leads to a directory or file to support jar files that may not have the typical *.jar ending.

Fixes: #19378

@theresa-m
Copy link
Contributor Author

With this change the test described in #19378 has 0% stale classes:

# Stale classes                      = 0
% Stale classes                      = 0%

@theresa-m theresa-m marked this pull request as ready for review April 25, 2024 18:57
@theresa-m theresa-m marked this pull request as draft April 25, 2024 19:21
hangshao0
hangshao0 reviewed Apr 25, 2024
View reviewed changes
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
keithc-ca
keithc-ca requested changes Apr 25, 2024
View reviewed changes
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
@theresa-m theresa-m force-pushed the fix_19378 branch 2 times, most recently from 1824f79 to 873d5d0 Compare April 26, 2024 20:22
@theresa-m theresa-m marked this pull request as ready for review April 26, 2024 20:23
@hangshao0
Copy link
Contributor

Jenkins test sanity,extended plinux jdk17

@hangshao0
Copy link
Contributor

Jenkins test sanity,extended win jdk8

@hangshao0
Copy link
Contributor

Jenkins test sanity,extended xlinux jdk21

@hangshao0
Copy link
Contributor

I aborted the JDK17_ppc64le_linux build as there are no machines available.

@hangshao0
Copy link
Contributor

@theresa-m There are test failures on Windows Java 8.

@hangshao0
Copy link
Contributor

jenkins line endings check

@hangshao0
Copy link
Contributor

Jenkins test sanity,extended win jdk8

@hangshao0
Copy link
Contributor

Jenkins test sanity,extended xlinux jdk21

@hangshao0
Copy link
Contributor

Test failures in: https://openj9-jenkins.osuosl.org/job/Test_openjdk8_j9_sanity.functional_x86-64_windows_Personal_testList_1/424/

@theresa-m
Copy link
Contributor Author

theresa-m commented May 17, 2024 •
edited

From my understanding the failing tests cmdLineTester_SCHelperCompatTests_win_0 and cmdLineTester_SCHelperCompatTests_win_1 are meant to be disabled. See #14474

@pshipton
Copy link
Member

pshipton commented May 17, 2024 •
edited

They are only excluded for AOT testing. They run and pass nightly.
https://hyc-runtimes-jenkins.swg-devops.com/job/Test_openjdk8_j9_sanity.functional_x86-64_windows/573

AOT testing is a special test mode where the tests are run once to populate AOT, and then run a second time to use the AOT.

@theresa-m
Copy link
Contributor Author

I have verified with a personal build that windows sanity and extended tests are passing now.

I moved correctURLPath inside getCpeTypeForProtocol so that all calls to this method will have the correctly formatted path for windows.

hangshao0
hangshao0 reviewed May 21, 2024
View reviewed changes
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
keithc-ca
keithc-ca requested changes May 21, 2024
View reviewed changes
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-5.xml Show resolved Hide resolved
@theresa-m
Copy link
Contributor Author

Thanks Hang and Keith, this is ready for another review.

hangshao0
hangshao0 reviewed May 21, 2024
View reviewed changes
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
keithc-ca
keithc-ca requested changes May 21, 2024
View reviewed changes
runtime/jcl/j9jcl.tdf Show resolved Hide resolved
runtime/jcl/j9jcl.tdf Outdated Show resolved Hide resolved
test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-5.xml Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
@theresa-m theresa-m force-pushed the fix_19378 branch 3 times, most recently from cef5b47 to 6b94d8c Compare May 22, 2024 14:44
keithc-ca
keithc-ca requested changes May 22, 2024
View reviewed changes
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Outdated Show resolved Hide resolved
runtime/jcl/common/shared.c Show resolved Hide resolved
@theresa-m theresa-m requested a review from keithc-ca May 23, 2024 13:50
@theresa-m
Check file type for shared class cache jar files
8e3aa0e 
Use the port library to check if path leads to a directory or file
to support jar files that may not have the typical *.jar ending.

Signed-off-by: Theresa Mammarella <[email protected]>
@keithc-ca
Copy link
Contributor

Jenkins test sanity,extended alinux jdk21

@hangshao0
Copy link
Contributor

Jenkins test sanity,extended win jdk8

@keithc-ca keithc-ca merged commit ec6dc8e into eclipse-openj9:master May 24, 2024
9 checks passed
@theresa-m theresa-m mentioned this pull request May 24, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@keithc-ca keithc-ca keithc-ca approved these changes

@hangshao0 hangshao0 hangshao0 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@theresa-m @hangshao0 @pshipton @keithc-ca