8316532: Native library copying in BuildMicrobenchmark.gmk cause dups on macOS

[erikj79]

After JDK-8253620, BuildMicrobenchmark.gmk has started printing warnings about overriding targets on macos. This is caused by a CopyFiles using the FLATTEN option in combination with debug symbols on macos having the same filename as the dylib itself.

In this fix, I'm changing the CopyFiles to no longer flatten the file structure. I'm also filtering the list of files to be copied to only include files from the native output lib dir. This avoids having any files from the support dir (e.g. dependency *.d files) from being copied into the test image. The resulting native directory in the test-image ends up having all native libraries in it, with debug symbols in their respective *.dSYM sub-directories, as expected.

---

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-8316532: Native library copying in BuildMicrobenchmark.gmk cause dups on macOS (Bug - P4)

Reviewers

• Magnus Ihse Bursie (@magicus - Reviewer)
• Claes Redestad (@cl4es - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15824

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

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

@erikj79 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 (1661cb40)

[magicus]

Does this change the actual path where the lib*.dylib files end up? If so, do we need any changes to the runtime configuration of the micros to get them to properly pick up the libs?

[erikj79]

Does this change the actual path where the lib*.dylib files end up? If so, do we need any changes to the runtime configuration of the micros to get them to properly pick up the libs?

No, they end up in the same place (<test-image>/micro/native/*.dylib), sorry if that wasn't clear. The main difference to before JDK-8253620 is that we no longer put make dependency (*.d) files in the same dir in the test image.

[magicus]

Sounds good, then!

[openjdk]

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

8316532: Native library copying in BuildMicrobenchmark.gmk cause dups on macOS

Reviewed-by: ihse, redestad

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

• 455cfae: 8315880: change LockingMode default from LM_LEGACY to LM_LIGHTWEIGHT
• 9e00949: 8316427: Duplicated code for {obj,type}ArrayKlass::array_klass
• c43ebd3: 8315981: Opensource five more random Swing tests
• e30e356: 8316461: Fix: make test outputs TEST SUCCESS after unsuccessful exit
• 242eeae: 8286757: adlc tries to build with /pathmap but without /experimental:deterministic
• b275bdd: 8308995: Update Network IO JFR events to be static mirror events
• e1870d3: 8316411: compiler/compilercontrol/TestConflictInlineCommands.java fails intermittent with force inline by CompileCommand missing
• ec74194: 8316546: Backout JDK-8315932: runtime/InvocationTests spend a lot of time on dependency verification
• 2568188: 8316547: Use JUnit.dir jtreg property with jpackage JUnit tests
• 833a828: 8315876: Open source several Swing CSS related tests
• ... and 5 more: https://git.openjdk.org/jdk/compare/5f6cee86ef765677b0b9dc3662f4f20b636732bc...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.

[cl4es]

Thanks for fixing this!

[erikj79]

/integrate

[openjdk]

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

• 3301fb1: 8315869: UseHeavyMonitors not used
• 54028e7: 8316562: serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java times out after JDK-8314829
• 7c991cc: 8296246: Update Unicode Data Files to Version 15.1.0
• a021dbc: 8316149: Open source several Swing JTree JViewport KeyboardManager tests
• 455cfae: 8315880: change LockingMode default from LM_LEGACY to LM_LIGHTWEIGHT
• 9e00949: 8316427: Duplicated code for {obj,type}ArrayKlass::array_klass
• c43ebd3: 8315981: Opensource five more random Swing tests
• e30e356: 8316461: Fix: make test outputs TEST SUCCESS after unsuccessful exit
• 242eeae: 8286757: adlc tries to build with /pathmap but without /experimental:deterministic
• b275bdd: 8308995: Update Network IO JFR events to be static mirror events
• ... and 9 more: https://git.openjdk.org/jdk/compare/5f6cee86ef765677b0b9dc3662f4f20b636732bc...master

Your commit was automatically rebased without conflicts.

[openjdk]

@erikj79 Pushed as commit 3461c7b.

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