Skip to content

Conversation

@magicus
Copy link
Member

@magicus magicus commented Jan 23, 2025

To figure out the root of the JDK build, we set the TOPDIR variable in configure. Furthermore, we clean it up using UTIL_FIXUP_PATH as we do with all paths. On Windows, this can result in the path becoming all lowercase. Since Windows paths are case insensitive, this is normally not a problem. However, we try to strip the TOPDIR from paths in several locations like this:

$$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR))

and that will only work if the case actually matches.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8348391: Keep case if possible for TOPDIR (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23259/head:pull/23259
$ git checkout pull/23259

Update a local copy of the PR:
$ git checkout pull/23259
$ git pull https://git.openjdk.org/jdk.git pull/23259/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23259

View PR using the GUI difftool:
$ git pr show -t 23259

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23259.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 23, 2025

👋 Welcome back ihse! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jan 23, 2025

@magicus This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8348391: Keep case if possible for TOPDIR

Reviewed-by: erikj

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 15 new commits pushed to the master branch:

  • 5cc690d: 8347994: Add additional diagnostics to macOS failure handler to assist with diagnosing MCast test failures
  • c00557f: 8345049: Remove the jmx.tabular.data.hash.map compatibility property
  • 8b46db0: 8345045: Remove the jmx.remote.x.buffer.size JMX notification property
  • 119899b: 8345048: Remove the jmx.extend.open.types compatibility property
  • 89bfcb8: 8348308: Make fields of ListSelectionEvent final
  • 17df515: 8348303: Remove repeated 'a' from ListSelectionEvent
  • 337118d: 8348388: Incorrect copyright header in TestFluidAndNonFluid.java
  • 3069e91: 8344969: Remove the jmx.mxbean.multiname compatibility property
  • c882160: 8344966: Remove the allowNonPublic MBean compatibility property
  • 6032f6e: 8341696: C2: Non-fluid StringBuilder pattern bails out in OptoStringConcat
  • ... and 5 more: https://git.openjdk.org/jdk/compare/b720517cb33c2119ec6ed85504bce321de748228...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 23, 2025
@openjdk
Copy link

openjdk bot commented Jan 23, 2025

@magicus The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Jan 23, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 23, 2025

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

Will this also fix the issue with case insensitive paths on Mac, where if the $PWD value has a different case than the actual path to the workspace root, we fail to recognize that it's the workspace root?

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 23, 2025
@magicus
Copy link
Member Author

magicus commented Jan 23, 2025

Unfortunately not, I think. On Windows, we transform paths to lower case if we need to go to short format (8.3) to make it look nicer. As far as I recall, we do not do that for any other platform. The macOS issue you are thinking about (I think) is about first do "cd MYJDK" and then configure, and then "cd myjdk" and then make. I'm actually not sure how to tackle that one, more than trying to figure out the "correct" name of the directory (which apparently is a bit tricky, according to my quick googling).

@magicus
Copy link
Member Author

magicus commented Jan 23, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Jan 23, 2025

Going to push as commit 44e5cca.
Since your change was applied there have been 16 commits pushed to the master branch:

  • 7460a0a: 8348392: Make claims "other matches are possible" even when that is not true
  • 5cc690d: 8347994: Add additional diagnostics to macOS failure handler to assist with diagnosing MCast test failures
  • c00557f: 8345049: Remove the jmx.tabular.data.hash.map compatibility property
  • 8b46db0: 8345045: Remove the jmx.remote.x.buffer.size JMX notification property
  • 119899b: 8345048: Remove the jmx.extend.open.types compatibility property
  • 89bfcb8: 8348308: Make fields of ListSelectionEvent final
  • 17df515: 8348303: Remove repeated 'a' from ListSelectionEvent
  • 337118d: 8348388: Incorrect copyright header in TestFluidAndNonFluid.java
  • 3069e91: 8344969: Remove the jmx.mxbean.multiname compatibility property
  • c882160: 8344966: Remove the allowNonPublic MBean compatibility property
  • ... and 6 more: https://git.openjdk.org/jdk/compare/b720517cb33c2119ec6ed85504bce321de748228...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 23, 2025
@openjdk openjdk bot closed this Jan 23, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 23, 2025
@openjdk
Copy link

openjdk bot commented Jan 23, 2025

@magicus Pushed as commit 44e5cca.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@magicus magicus deleted the keep-topdir-case branch January 23, 2025 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build build-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants