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

openjdk.mk: make MEMORY_SIZE computation portable #5350

Merged
merged 1 commit into from
May 30, 2024

Conversation

zzambers
Copy link
Contributor

@zzambers zzambers commented May 28, 2024

Fixes non-portable (bash specific) code causing errors in log on some systems (ubuntu):

...
18:43:25  /bin/sh: 1: [[: not found
18:43:25  /bin/sh: 1: [[: not found
18:43:25  expr: syntax error: unexpected argument '1024'
18:43:25  /bin/sh: 1: [: Illegal number: 
18:43:25  expr: syntax error: unexpected argument '2048'
18:43:25  expr: syntax error: missing argument after '>'
...

testing:
linux_x86-64 OK

@karianna karianna requested review from sxa and smlambert May 29, 2024 07:15
@smlambert
Copy link
Contributor

sparcv9_solaris JDK 8: https://ci.adoptium.net/job/Grinder/10132
x86-64_windows JDK 21: https://ci.adoptium.net/job/Grinder/10133

Also check a couple other platforms that often have different versions of tools installed ( make / bash )

@sophia-guo
Copy link
Contributor

testing:
linux_x86-64 OK

This is the same one with the error message and use the branch openjdk-hotspot-test, not the openjdk-memsize-fix

@karianna karianna requested a review from sophia-guo May 30, 2024 01:46
@zzambers
Copy link
Contributor Author

testing:
linux_x86-64 OK

This is the same one with the error message and use the branch openjdk-hotspot-test, not the openjdk-memsize-fix

Oh, you are right, I have accidentally used link to to grinder run with error twice.

Testing supposed to link this one:
https://ci.adoptium.net/view/Test_grinder/job/Grinder/10097/

I will update description

@zzambers
Copy link
Contributor Author

sparcv9_solaris JDK 8: https://ci.adoptium.net/job/Grinder/10132 x86-64_windows JDK 21: https://ci.adoptium.net/job/Grinder/10133

Also check a couple other platforms that often have different versions of tools installed ( make / bash )

I have only ran linux since modified code is in:

ifeq ($(OS),Linux)
...
endif

but probably better to test other systems anyway

@sophia-guo sophia-guo merged commit face041 into adoptium:master May 30, 2024
2 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.

3 participants