8342609: jpackage test helper function incorrectly removes a directory instead of its contents only

[GoeLin]

I backport this for parity with 21.0.7-oracle.
17 has the same issue.

Resolved Copyright, probably clean anyways.

---

Progress

• JDK-8342609 needs maintainer approval
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Warning

 ⚠️ Found leading lowercase letter in issue title for 8342609: jpackage test helper function incorrectly removes a directory instead of its contents only

Issue

• JDK-8342609: jpackage test helper function incorrectly removes a directory instead of its contents only (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/3165/head:pull/3165
$ git checkout pull/3165

Update a local copy of the PR:
$ git checkout pull/3165
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/3165/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3165

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/3165.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

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

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

8342609: jpackage test helper function incorrectly removes a directory instead of its contents only

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:

• e6fb662: 8345414: Google CAInterop test failures
• 8f93d8a: 8342602: Remove JButton/PressedButtonRightClickTest test
• e7fedf5: 8343128: PassFailJFrame.java test result: Error. Bad action for script: build}
• b121ce5: 8328553: Get rid of JApplet in test/jdk/sanity/client/lib/SwingSet2/src/DemoModule.java
• 0b14f53: 8326421: Add jtreg test for large arrayCopy disjoint case.
• 0ea0b86: 8329210: Delete Redundant Printer Dialog Modality Test
• 409158e: 8315883: Open source several Swing JToolbar tests
• a35aef8: 8316056: Open source several Swing JTree tests

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.

[openjdk]

This backport pull request has now been updated with issue from the original commit.

[openjdk]

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

[openjdk]

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

[mlbridge]

Webrevs

• 00: Full (0a9f55c5)

[GoeLin]

GHA failure: well konwn wget issue, unrelated.

[GoeLin]

/integrate

[openjdk]

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

• 6ef13ab: 8339883: Open source several AWT/2D related tests
• 743724e: 8319567: Update java/lang/invoke tests to support vm flags
• a266ca0: 8323196: jdk/jfr/api/consumer/filestream/TestOrdered.java failed with "Events are not ordered! Reuse = false"
• 5623e10: 8331153: JFR: Improve logging of jdk/jfr/api/consumer/filestream/TestOrdered.java
• e6fb662: 8345414: Google CAInterop test failures
• 8f93d8a: 8342602: Remove JButton/PressedButtonRightClickTest test
• e7fedf5: 8343128: PassFailJFrame.java test result: Error. Bad action for script: build}
• b121ce5: 8328553: Get rid of JApplet in test/jdk/sanity/client/lib/SwingSet2/src/DemoModule.java
• 0b14f53: 8326421: Add jtreg test for large arrayCopy disjoint case.
• 0ea0b86: 8329210: Delete Redundant Printer Dialog Modality Test
• ... and 2 more: https://git.openjdk.org/jdk17u-dev/compare/247815b28d0b49af3094d779b29208dc65b3f59d...master

Your commit was automatically rebased without conflicts.

[openjdk]

@GoeLin Pushed as commit ac22219.

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