8317807: JAVA_FLAGS removed from jtreg running in JDK-8317039

[magicus]

Unfortunately, JDK-8317039 caused a regression. The $(JAVA) variable did not just contain a path, which was assumed by the patch, but also the necessary flags in $(JAVA_FLAGS).

Furthermore, the original implementation deviated from how we typically treat JDKs in the build system, that is, we store the root to the JDK as the primary setting, and then we use that as base to get a fixpath'ed executable command line. I've changed the code to more closely align to our existing uses of external JDKs.

---

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-8317807: JAVA_FLAGS removed from jtreg running in JDK-8317039 (Bug - P3)

Reviewers

• Erik Joelsson (@erikj79 - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16288

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

Using diff file

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

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

• 00: Full (efc37cd4)

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

8317807: JAVA_FLAGS removed from jtreg running in JDK-8317039

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

• a045258: 8209595: MonitorVmStartTerminate.java timed out
• 2121575: 8318421: AbstractPipeline.sourceStageSpliterator() chases pointers needlessly
• 200b5a2: 8318420: AbstractPipeline invokes overridden method in constructor
• 5281499: 8316563: test tools/jpackage/linux/LinuxResourceTest.java fails on CentOS Linux release 8.5.2111 and Fedora 27
• 8065233: 8318598: FFM stylistic cleanups
• b1228de: 8314588: gc/metaspace/TestMetaspaceInitialization.java failed "assert(capacity_until_gc >= committed_bytes) failed: capacity_until_gc: 3145728 < committed_bytes: 3211264"
• 5a97411: 8317971: RISC-V: implement copySignF/D and signumF/D intrinsics
• 9144287: 8318601: Remove javadoc text about restricted methods

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

[magicus]

/integrate

[openjdk]

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

• 704c6ea: 8303525: Refactor/cleanup open/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
• 7c0a828: 8318649: G1: Remove unimplemented HeapRegionRemSet::add_code_root_locked
• ff5c5b6: 8318643: +UseTransparentHugePages must enable +UseLargePages
• fc29a2e: 8318082: ConcurrentModificationException from IndexWriter
• 729f4c5: 8318507: G1: Improve remset clearing for humongous candidates
• 4eab39d: 8318585: Rename CodeCache::UnloadingScope to UnlinkingScope
• ffadd63: 8317868: Add @sealedGraph to MethodHandleDesc and descendants
• ecd25e7: 8318484: Initial version of cdsConfig.hpp
• a876beb: 8316741: BasicStroke.createStrokedShape miter-limits failing on small shapes
• 4cf195f: 8318573: The nsk.share.jpda.SocketConnection should fail if socket was closed.
• ... and 15 more: https://git.openjdk.org/jdk/compare/40106422bd2ae3da98d028bdbab2c240a71081e3...master

Your commit was automatically rebased without conflicts.

[openjdk]

@magicus Pushed as commit 99de9bb.

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