JDK-8312467: relax the builddir check in make/autoconf/basic.m4

[MBaesken]

In case of issues in the configure step, we run into error messages like this :

configure: Current directory is /openjdk/jdk_4/build_mymachine.
configure: Since this is not the source root, configure will output the configuration here
configure: (as opposed to creating a configuration in <src_root>/build/).
configure: However, this directory is not empty. This is not allowed, since it could
configure: seriously mess up just about everything.
configure: Try 'cd /mysrcdir/jdk' and restart configure
configure: (or create a new empty directory and cd to it).
configure: error: Will not continue creating configuration in /openjdk/jdk_4/build_mymachine
configure exiting with result code 1

Probably the check could be relaxed; it tests for 'if test ! -e "$OUTPUTDIR/spec.gmk"; then ...'
but the non-existance of spec.gmk does not mean we are not in a build directory.
We could additionally check for e.g. $OUTPUTDIR/configure-support/config.log or something related to check if it is a build directory .

---

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-8312467: relax the builddir check in make/autoconf/basic.m4 (Enhancement - P4)

Reviewers

• Christoph Langer (@RealCLanger - Reviewer)
• Erik Joelsson (@erikj79 - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15017

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back mbaesken! 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]

@MBaesken 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.

[mlbridge]

Webrevs

• 01: Full - Incremental (460b5a8d)
• 00: Full (bc4f64da)

[RealCLanger]

Looks sensible. However, could you please stick to only one if condition?

if test ! -e "$OUTPUTDIR/spec.gmk" && test ! -e "$OUTPUTDIR/configure-support/generated-configure.sh"; then

This will help avoid unnecessary indentation and also keeps the change smaller.

[MBaesken]

Hi Christoph, I adjusted the check.
Additionally I adjusted the output in the failure case, the 'bad' files causing the check to fail are printed now .

[RealCLanger]

This looks good to me but someone from build group needs to review this, too.

[openjdk]

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

8312467: relax the builddir check in make/autoconf/basic.m4

Reviewed-by: clanger, 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 181 new commits pushed to the master branch:

• 509f80b: 8313889: Fix -Wconversion warnings in foreign benchmarks
• 5c3041c: 8313435: Clean up unused default methods code
• 8752d49: 8313785: Fix -Wconversion warnings in prims code
• 41bdcde: 8313875: Use literals instead of static fields in java.util.Math: twoToTheDoubleScaleUp, twoToTheDoubleScaleDown
• 091e65e: 8313552: Fix -Wconversion warnings in JFR code
• 7e20952: 8140326: G1: Consider putting regions where evacuation failed into next collection set
• 28fd7a1: 8311179: Generational ZGC: gc/z/TestSmallHeap.java failed with OutOfMemoryError
• a1115a7: 8312204: unexpected else with statement causes compiler crash
• 87a6acb: 8313792: Verify 4th party information in src/jdk.internal.le/share/legal/jline.md
• 87b08b6: 8307408: Some jdk/sun/tools/jhsdb tests don't pass test JVM args to the debuggee JVM
• ... and 171 more: https://git.openjdk.org/jdk/compare/b772e67e2929afd9f9d6a4b08713e41f891667c0...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.

[MBaesken]

Hi Christoph, thanks for the review !

May I have a second review ?

[MBaesken]

Any other reviewers ?

[MBaesken]

Hi Christoph and Erik, thanks for the reviews !

/integrate

[openjdk]

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

• 77e5739: 8310118: Resource files should be moved to appropriate directories
• 96304f3: 8313691: use close after failing os::fdopen in vmError and ciEnv
• 3fb4805: 8307462: [REDO] VmObjectAlloc is not generated by intrinsics methods which allocate objects
• 0a42c44: 8313954: Add gc logging to vmTestbase/vm/gc/containers/Combination05
• 735b16a: 8313752: InstanceKlassFlags::print_on doesn't print the flag names
• d3b578f: 8313345: SuperWord fails due to CMove without matching Bool pack
• 31a307f: 8306441: Two phase segmented heap dump
• 515add8: 8313206: PKCS11 tests silently skip execution
• 6864441: 8313809: String template fails with java.lang.StringIndexOutOfBoundsException if last fragment is UTF16
• 509f80b: 8313889: Fix -Wconversion warnings in foreign benchmarks
• ... and 180 more: https://git.openjdk.org/jdk/compare/b772e67e2929afd9f9d6a4b08713e41f891667c0...master

Your commit was automatically rebased without conflicts.

[openjdk]

@MBaesken Pushed as commit 6e3cc13.

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