8358515: make cmp-baseline is broken after JDK-8349665

[magicus]

The fix in to JDK-8357991 was not enough to solve all problems that had been introduced with JDK-8349665. Also builds run using COMPARE_BUILD was affected.

The core of the problem was that there were multiple additional ways to run what esstentially amount to make -f Init.gmk main, in places that I did not find before. So I took a step back and chose a safer approach: now the main target in Init.gmk depends on an additional target, that will always make sure that the necessary helper files are present. This means the specific patch for bootcycle builds in JDK-8357991 could be reverted. This solution is also future-proof if we should figure out any new creative ways of calling main in Init.gmk.

---

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

Warning

 ⚠️ Found leading lowercase letter in issue title for 8358515: make cmp-baseline is broken after JDK-8349665

Issue

• JDK-8358515: make cmp-baseline is broken after JDK-8349665 (Bug - P4)

Reviewers

• Erik Joelsson (@erikj79 - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25618

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 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]

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

8358515: make cmp-baseline is broken after JDK-8349665

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

• 406f1bc: 8357650: ThreadSnapshot to take snapshot of thread for thread dumps
• e984fa7: 8358539: ProblemList jdk/jfr/api/consumer/TestRecordingFileWrite.java
• 461cb84: 8345538: Robot.mouseMove doesn't clamp bounds on macOS when trying to move mouse off screen
• ... and 13 more: https://git.openjdk.org/jdk/compare/4618374269e8636c772d921ad0c2c2d9e5e3e643...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]

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

[mlbridge]

Webrevs

• 01: Full - Incremental (fd88653b)
• 00: Full (afc1b8cf)

[magicus]

/integrate auto

[openjdk]

@magicus This pull request will be automatically integrated when it is ready

[openjdk]

/integrate

[openjdk]

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

• cc11b7d: 8356128: Correct documentation for --linux-package-deps
• 406f1bc: 8357650: ThreadSnapshot to take snapshot of thread for thread dumps
• e984fa7: 8358539: ProblemList jdk/jfr/api/consumer/TestRecordingFileWrite.java
• ... and 14 more: https://git.openjdk.org/jdk/compare/4618374269e8636c772d921ad0c2c2d9e5e3e643...master

Your commit was automatically rebased without conflicts.

[openjdk]

@openjdk[bot] Pushed as commit a44a470.

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