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

Enable Mac Aarch64 reproducible comparing tests #3972

Merged
merged 5 commits into from
Oct 10, 2024

Conversation

sophia-guo
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the aarch Issues that affect or relate to the aarch ARCHITECTURE label Oct 4, 2024
@sophia-guo sophia-guo changed the title Mac aarch Enable Mac Aarch64 reproducible comparing tests Oct 4, 2024
@@ -234,7 +237,7 @@ function removeMacOSNonComparableData() {
else
# Format uuid for BINREPL
uuidhex="${uuid:0:2}:${uuid:2:2}:${uuid:4:2}:${uuid:6:2}:${uuid:8:2}:${uuid:10:2}:${uuid:12:2}:${uuid:14:2}:${uuid:16:2}:${uuid:18:2}:${uuid:20:2}:${uuid:22:2}:${uuid:24:2}:${uuid:26:2}:${uuid:28:2}:${uuid:30:2}"
if ! java "$TEMURIN_TOOLS_BINREPL" --inFile "$f" --outFile "$f" --hex "${uuidhex}-AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA" --firstOnly; then
if ! "${JDK_DIR}"/bin/java "$TEMURIN_TOOLS_BINREPL" --inFile "$f" --outFile "$f" --hex "${uuidhex}-AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA" --firstOnly; then
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@andrew-m-leonard this line got the error

00:18:45  Failed setting boot class path.
00:18:45    FAILED ==> java "temurin.tools.BinRepl" --inFile "src_jdk/Contents/Home/../../Contents/Home/bin/jwebserver" --outFile "src_jdk/Contents/Home/../../Contents/Home/bin/jwebserver" --hex "8C:04:09:F5:4F:35:3A:EB:B0:C1:42:BF:D8:09:D4:D5-AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA" --firstOnly

https://ci.adoptium.net/view/Test_grinder/job/Grinder/11059/console

Any suggestions?

Copy link
Contributor

Choose a reason for hiding this comment

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

@sophia-guo it looks like the "java" being used is not working, is the PATH set correctly to find a useable JDK?

05:18:45  Error occurred during initialization of VM
05:18:45  Failed setting boot class path.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was set to the tests jdk if ! "${JDK_DIR}"/bin/java" same as for the javap. Did you mean this is different from the javap, we can use whatever workable java? As I did notice that after we did the preprocess of the jdk ( remove signartures), java doesn't work any more.

Copy link
Contributor Author

@sophia-guo sophia-guo Oct 8, 2024

Choose a reason for hiding this comment

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

what's the required version of this usable JDK? Tried with tested jdk( jdk21) got
https://ci.adoptium.net/view/Test_grinder/job/Grinder/11124/console

20:52:57  Removing MacOS dylib non-comparable UUID from src_jdk/Contents/Home
20:53:17  Error: Could not find or load main class temurin.tools.BinRepl
20:53:17  Caused by: java.lang.ClassNotFoundException: temurin.tools.BinRepl
20:53:17    FAILED ==> /Users/admin/workspace/workspace/Grinder/aqa-tests/system/reproducibleCompare/comp-jdk-build/compare/src_jdk/Contents/Home_BK/bin/java "temurin.tools.BinRepl" --inFile "src_jdk/Contents/Home/../../Contents/Home/bin/jwebserver" --outFile "src_jdk/Contents/Home/../../Contents/Home/bin/jwebserver" --hex "8C:04:09:F5:4F:35:3A:EB:B0:C1:42:BF:D8:09:D4:D5-AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA:AA" --firstOnly

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Add a copy of compared jdk as the jdk to call javap. Everything looks good, except 150 libs files differs. FYI @andrew-m-leonard https://ci.adoptium.net/view/Test_grinder/job/Grinder/11167/console

Copy link
Contributor

Choose a reason for hiding this comment

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

@sophia-guo thank you, yes the console looks clean from a script perspective, which is great.
So the issue is now just making it 100%
I've raised the following issues on this and the other platforms:

Copy link
Contributor

@karianna karianna left a comment

Choose a reason for hiding this comment

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

Will need a rebase

Copy link
Contributor

@andrew-m-leonard andrew-m-leonard left a comment

Choose a reason for hiding this comment

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

look ok I think

Copy link
Contributor

@karianna karianna left a comment

Choose a reason for hiding this comment

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

linter and license header updates needed

@sophia-guo sophia-guo force-pushed the macAarch branch 3 times, most recently from d9c51dd to 96003cc Compare October 10, 2024 14:47
@sophia-guo
Copy link
Contributor Author

@sophia-guo sophia-guo self-assigned this Oct 10, 2024
@karianna karianna merged commit 08621c7 into adoptium:master Oct 10, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
aarch Issues that affect or relate to the aarch ARCHITECTURE
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants