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

SapMachine #1894: Add SapMachine tools plugin to jlink #1893

Merged
merged 9 commits into from
Jan 13, 2025

Conversation

parttimenerd
Copy link
Contributor

@parttimenerd parttimenerd commented Jan 9, 2025

Add --add-sapmachine-tools option to jlink

fixes #1894

@SapMachine
Copy link
Member

Hello @parttimenerd, I'm sorry, this pull request doesn't meet the expectations. The pull request description has an invalid format. Please have a look at https://github.com/SAP/SapMachine/wiki/Formal-Requirements-of-Pull-Requests .

@RealCLanger RealCLanger changed the title Add SapMachine tools jlink plugin SapMachine #1894: Add SapMachine tools plugin to jlink Jan 9, 2025
@RealCLanger
Copy link
Member

retest this please

@SapMachine
Copy link
Member

Hello @parttimenerd, this pull request fulfills all formal requirements.

@SapMachine
Copy link
Member

Hello @parttimenerd, this pull request fulfills all formal requirements.

@MBaesken
Copy link
Member

Why is CDSPluginTest used in the test ?

@parttimenerd
Copy link
Contributor Author

parttimenerd commented Jan 10, 2025

That was a mistake, but @RealCLanger is already modifying the PR, fixing this issue.

@SapMachine
Copy link
Member

Hello @parttimenerd, this pull request fulfills all formal requirements.

@RealCLanger
Copy link
Member

OK, here is my update. I made some cleanups and updated the testcase such that it would check for the SapMachine tools files in the original images in the beginning, that is whether they are expected to be there and exist or they are expected to be absent and do not exist.
In case they exist, the plugin functionality is tested.

I also added the test to tier1 and now I would expect to see test failures on the platforms where async profiler should be included. I'll address that later after seeing the results.

@SapMachine
Copy link
Member

Hello @parttimenerd, this pull request fulfills all formal requirements.

@SapMachine
Copy link
Member

Hello @parttimenerd, this pull request fulfills all formal requirements.

@SapMachine
Copy link
Member

Hello @parttimenerd, this pull request fulfills all formal requirements.

@SapMachine
Copy link
Member

Hello @parttimenerd, this pull request fulfills all formal requirements.

@SapMachine
Copy link
Member

Hello @parttimenerd, this pull request fulfills all formal requirements.

}

// async profiler is only available on a subset of platforms
boolean shouldHaveAsync = Platform.isOSX() ||
Copy link
Member

@MBaesken MBaesken Jan 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would probably do
* @requires (os.family=="linux" < os.family == "mac") & !vm.musl
because we do not have s390x in SapMachine, but up to you.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to intentionally run the test on all platforms. And when there are no async binaries (as expected), no errors should happen.

@@ -287,6 +287,7 @@ Invalid language tag: %s
include-locales.localedatanotfound=\
jdk.localedata module was not specified with --add-modules option

# SapMachine 2025-09-01: SapMachine tools plugin
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

 add-sapmachine-tools.usage=\
-\  --add-sapmachine-tools   Add SapMachine specific tools to the image.
+\  --add-sapmachine-tools    Add SapMachine specific tools to the image.

to get the right indent in the help output.

@SapMachine
Copy link
Member

Hello @parttimenerd, this pull request fulfills all formal requirements.

RealCLanger

This comment was marked as outdated.

@RealCLanger RealCLanger merged commit bbf2165 into SAP:sapmachine Jan 13, 2025
73 of 79 checks passed
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.

Add SapMachine tools plugin to jlink
5 participants