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

Simplify the parsing logic of makejdk_any_platform_args #3957

Merged
merged 7 commits into from
Oct 4, 2024

Conversation

sophia-guo
Copy link
Contributor

@sophia-guo sophia-guo commented Sep 26, 2024

Close #3955

@sophia-guo sophia-guo marked this pull request as draft September 26, 2024 12:51
@sophia-guo
Copy link
Contributor Author

sophia-guo commented Sep 26, 2024

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

13:04:21  make[5]: Entering directory '/cygdrive/c/comp-jdk-build/temurin-build/workspace/build/src'
13:04:21  Error: Cannot locate spec.gmk, given by SPEC=win_x86-64.
13:04:21  /cygdrive/c/comp-jdk-build/temurin-build/workspace/build/src/make/Init.gmk:124: *** Cannot continue.  Stop.
13:04:21  make[5]: Leaving directory '/cygdrive/c/comp-jdk-build/temurin-build/workspace/build/src'
13:04:21  OpenJDK make failed, archiving make failed logs
13:04:22  Archiving and compressing with gzip
13

@andrew-m-leonard the build and error message I got

@sophia-guo sophia-guo changed the title Win2 Simplify the parsing logic of makejdk_any_platform_args Sep 27, 2024
@sophia-guo
Copy link
Contributor Author

grinder https://ci.adoptium.net/view/Test_grinder/job/Grinder/11002/ - unset SPEC temporarily.

@andrew-m-leonard see the grinder unset SPEC temporarily is the test results good?

@andrew-m-leonard
Copy link
Contributor

andrew-m-leonard commented Sep 30, 2024

grinder https://ci.adoptium.net/view/Test_grinder/job/Grinder/11002/ - unset SPEC temporarily.

@andrew-m-leonard see the grinder unset SPEC temporarily is the test results good?

@sophia-guo good to see unsetting SPEC resolved the autoconf failure

The 3 differing files are caused by a failure in patching the SystemModule classes:

17:05:57  find: '': No such file or directory
17:05:57  find: '': No such file or directory
17:05:57  find: '': No such file or directory
17:05:57  Successfully removed all SystemModules jdk.jpackage hash differences from 

It was clearly not "Successful" !!
I think it is this find line that is failing:

FILES=$(find "${JDK_DIR}" -type f -name "$systemModule")

I am not sure why ${JDK_DIR} is not being resolved, but I wonder if these two functions should be changed to have it passed as a param, like all the others are:

function removeSystemModulesHashBuilderParams() {
function processModuleInfo() {

It could also be an issue with the class names it is trying to find that contain $'s, I wonder if that fails for some reason on Windows... maybe it needs some special escaping for Windows?

systemModules="SystemModules\$0.class SystemModules\$all.class SystemModules\$default.class"

@sophia-guo
Copy link
Contributor Author

sophia-guo commented Oct 3, 2024

https://ci.adoptium.net/view/Test_grinder/job/Grinder/11051/ - ReproduciblePercent = 100 %

@sophia-guo sophia-guo marked this pull request as ready for review October 3, 2024 18:31
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.

looks ok

@sophia-guo sophia-guo merged commit 47929da into adoptium:master Oct 4, 2024
26 checks passed
judovana added a commit to judovana/temurin-build that referenced this pull request Oct 4, 2024
Simplify the parsing logic of makejdk_any_platform_args (adoptium#3957) have
forgot to add mandatpory parameter to usage of
removeSystemModulesHashBuilderParams in
tooling/reproducible/comparable_patch.sh#L351
karianna pushed a commit that referenced this pull request Oct 9, 2024
Simplify the parsing logic of makejdk_any_platform_args (#3957) have
forgot to add mandatpory parameter to usage of
removeSystemModulesHashBuilderParams in
tooling/reproducible/comparable_patch.sh#L351
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.

Rebuild_Same_JDK_Reproducibility_Test_win fails with syntax error
3 participants