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

8295192: Use original configure command line when called from a script #10669

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Oct 12, 2022

Sometimes, the configure script is not called directly, but indirectly, using e.g. a wrapper script. This happens for instance in the case of using jib.sh.

In such cases, calling "make reconfigure" will not re-execute the original wrapper script. This can result in subtle bugs.

Instead, make a way to save the original command line from a wrapper script, and use that instead when running "make reconfigure".

This PR also includes the corresponding changes needed to utilize this in jib.sh.


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-8295192: Use original configure command line when called from a script

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10669

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 12, 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 Oct 12, 2022
@openjdk
Copy link

openjdk bot commented Oct 12, 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 Oct 12, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 12, 2022

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.

I think this looks ok, but I hope you have tested it thoroughly as jib.sh is a pretty sensitive script to make changes to.

@openjdk
Copy link

openjdk bot commented Oct 12, 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:

8295192: Use original configure command line when called from a script

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

  • 7e4868d: 8294847: Fix calculation of G1 effective scanned cards prediction
  • 2f60675: 8294997: Improve ECC math operations
  • 94caecb: 8294906: Memory leak in PKCS11 NSS TLS server
  • 03e63a2: 8295225: [JVMCI] codeStart should be cleared when entryPoint is cleared
  • 26ac836: 8291638: Keep-Alive timeout of 0 should close connection immediately
  • 6ae7e4d: 8293984: Unnecessary Vector usage in PropertyEditorSupport
  • cd1357b: 8295229: Try to verify gtest version
  • 90fb9a0: 8295102: Always load @lambda-form-invoker lines from default classlist
  • ac19414: 8294994: Update Jarsigner and Keytool i18n tests to validate i18n compliance
  • 1961e81: 8289509: Improve test coverage for XPath Axes: descendant, descendant-or-self, following, following-sibling
  • ... and 14 more: https://git.openjdk.org/jdk/compare/392f35df4be1a9a8d7a67a25ae01230c7dd060ac...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 Oct 12, 2022
@magicus
Copy link
Member Author

magicus commented Oct 12, 2022

I've verified that the environment variables are properly set. I don't know what else to test. Do you have any suggestions?

@magicus
Copy link
Member Author

magicus commented Oct 17, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Oct 17, 2022

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

  • cf07eae: 8295020: javac emits incorrect code for for-each on an intersection type.
  • b3bb3e6: 8295325: tools/jlink/plugins/SaveJlinkArgfilesPluginTest.java fails on Linux ppc64le
  • 9005af3: 8295110: RISC-V: Mark out relocations as incompressible
  • 74a51cc: 8292698: Improve performance of DataInputStream
  • d3781ac: 8295009: RISC-V: Interpreter intrinsify Thread.currentThread()
  • e7d0ab2: 8295379: ProblemList java/lang/Float/Binary16Conversion.java in Xcomp mode on x64
  • 404e8de: 8294865: x86: Improve the code generation of MulVB and MulVL
  • 2087424: 8295370: Update java.io.ObjectStreamField to use Class.descriptorString
  • 8487c56: 8295294: Misc cleanups in runtime/InvocationTests
  • 0043d58: 8293531: C2: some vectorapi tests fail assert "Not monotonic" with flag -XX:TypeProfileLevel=222
  • ... and 49 more: https://git.openjdk.org/jdk/compare/392f35df4be1a9a8d7a67a25ae01230c7dd060ac...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 17, 2022

@magicus Pushed as commit 552d8a2.

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

@magicus magicus deleted the real-configure-cmd-line branch October 18, 2022 09:43
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