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

8297348: make CONF=xxx should match if xxx is an exact match #11269

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Nov 21, 2022

A typical use case for multiple configurations is that you have a release configuration (say linux-x64) and a debug configuration (say linux-x64-debug). You can now easily select the debug configuration with CONF=debug, or both configurations with CONF=, but there is no way to select just the release configuration. Instead, workarounds using SPEC or CONF_NAME (which always does an exact match) is needed.

Instead, we should modify the behavior of CONF slightly, so if it gets an exact match, it should behave like CONF_NAME and select just that configurations.


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-8297348: make CONF=xxx should match if xxx is an exact match

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11269

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 21, 2022

👋 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 openjdk bot added the rfr Pull request is ready for review label Nov 21, 2022
@openjdk
Copy link

openjdk bot commented Nov 21, 2022

@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 Nov 21, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 21, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Nov 21, 2022

@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:

8297348: make CONF=xxx should match if xxx is an exact match

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 11 new commits pushed to the master branch:

  • b366d17: 8294073: Performance improvement for message digest implementations
  • 57f5cfd: 8296399: crlNumExtVal might be null inside X509CRLSelector::match
  • 0b04a99: 8297347: Problem list compiler/debug/TestStress*.java
  • 0ac0148: 8297342: make LOG=debug is too verbose
  • d0a7938: 8286575: Document how properties in java.security are parsed
  • 5c33454: 8296472: Remove ObjectLocker around appendToClassPathForInstrumentation call
  • 0800813: 8293584: CodeCache::old_nmethods_do incorrectly filters is_unloading nmethods
  • 16ab754: 8196018: java/awt/Scrollbar/ScrollbarMouseWheelTest/ScrollbarMouseWheelTest.java fails
  • 8b8d848: 8293422: DWARF emitted by Clang cannot be parsed
  • 59d8f67: 8297265: G1: Remove unnecessary null-check in RebuildCodeRootClosure::do_code_blob
  • ... and 1 more: https://git.openjdk.org/jdk/compare/e4206618ac82222f8f61e348cfa68db0d708fe90...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 ready Pull request is ready to be integrated label Nov 21, 2022
@magicus
Copy link
Member Author

magicus commented Nov 21, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Nov 21, 2022

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

  • 817e039: 8297352: configure should check pandoc version
  • 15e2e28: 8297353: Regenerated checked-in html files with new pandoc
  • b366d17: 8294073: Performance improvement for message digest implementations
  • 57f5cfd: 8296399: crlNumExtVal might be null inside X509CRLSelector::match
  • 0b04a99: 8297347: Problem list compiler/debug/TestStress*.java
  • 0ac0148: 8297342: make LOG=debug is too verbose
  • d0a7938: 8286575: Document how properties in java.security are parsed
  • 5c33454: 8296472: Remove ObjectLocker around appendToClassPathForInstrumentation call
  • 0800813: 8293584: CodeCache::old_nmethods_do incorrectly filters is_unloading nmethods
  • 16ab754: 8196018: java/awt/Scrollbar/ScrollbarMouseWheelTest/ScrollbarMouseWheelTest.java fails
  • ... and 3 more: https://git.openjdk.org/jdk/compare/e4206618ac82222f8f61e348cfa68db0d708fe90...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 21, 2022

@magicus Pushed as commit cd6a203.

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

@magicus magicus deleted the conf-exact-name-match branch November 21, 2022 19:02
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
2 participants