Skip to content

8343314: Move common properties from jpackage jtreg test declarations to TEST.properties file #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 11, 2024

I would like to backport this to make follow-up backports clean.

I checked all files that would not patch clean for predecessors that are candidates for
backport. The remaining resolves are the following:

test/jdk/tools/jpackage/TEST.properties
Resolved. Will backport 8314909, which probably makes this clean.

test/jdk/tools/jpackage/share/AppContentTest.java
One of the removed @modules statements is not in 21. It was added in 24 with 8341443.

test/jdk/tools/jpackage/share/RuntimeImageTest.java
Trivial resolve

test/jdk/tools/jpackage/share/jdk/jpackage/tests/JLinkOptionsTest.java
Resolved Copyright. "8308398: Move SunEC crypto provider into java.base" not in 21.

test/jdk/tools/jpackage/windows/WinChildProcessTest.java
Resolved. "8340311: JPackage app-image exe launches multiple exe's in JDK 22+" not in 21.

Some tests touched by this change are not in 21. Some came with new features,
but other with bug fixes that are theoretically applicable to 21. Non of these fixes
qualify for an obvious and simple backport that could be done as prereq of a
pure test rework. Here the list:

test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/DirectoryContentVerifierTest.java
test/jdk/tools/jpackage/share/InOutPathTest.java
Both added by "8325089: jpackage utility creates an "infinite", undeleteable directory tree", a bug
that sounds interesting for 21, 17. But it is big and rather new, so don't backport now.

test/jdk/tools/jpackage/linux/ServiceAndDesktopTest.java
test/jdk/tools/jpackage/linux/UpgradeTest.java
Both added by "8301856: Generated .spec file for RPM installers uninstalls desktop launcher
on update", a bug that sounds interesting for 21, 17. It was published in 22, so it should be
considered as stable. But it is big and Oracle did not address this yet, so let's not backport.

test/jdk/tools/jpackage/macosx/SigningOptionsTest.java
Added by "8311877: [macos] Add CLI options to provide signing identity directly to
codesign and productbuild" in 22. A new feature, no candidate for backport.

test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java
Added by "8310933: Copying from runtime image to application image should not
follow symlinks" in 22. Enhancement.

test/jdk/tools/jpackage/windows/WinNoRestartTest.java
Added by "8340311: JPackage app-image exe launches multiple exe's in JDK 22+" in 24.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8343314 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8343314: Move common properties from jpackage jtreg test declarations to TEST.properties file (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1221

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 11, 2024

👋 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
Copy link

openjdk bot commented Dec 11, 2024

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

8343314: Move common properties from jpackage jtreg test declarations to TEST.properties file

Reviewed-by: mdoerr

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

  • a21862a: 8328085: C2: Use after free in PhaseChaitin::Register_Allocate()
  • 1c69135: 8343129: Disable unstable check of ThreadsListHandle.sanity_vm ThreadList values
  • b682b1f: 8336498: [macos] [build]: install-file macro may run into permission denied error

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 openjdk bot changed the title Backport c33a8f52b613e5eff02f572eda876cbbfc7c22cf 8343314: Move common properties from jpackage jtreg test declarations to TEST.properties file Dec 11, 2024
@openjdk
Copy link

openjdk bot commented Dec 11, 2024

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

@openjdk openjdk bot added the backport label Dec 11, 2024
@GoeLin GoeLin force-pushed the goetz_backport_8343314 branch from 7db6b29 to f451d57 Compare December 12, 2024 13:07
@GoeLin GoeLin marked this pull request as ready for review December 13, 2024 08:22
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 13, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 13, 2024

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. JDK-8314909 is already backported. Seems like all "@modules jdk.jpackage/jdk.jpackage.internal" are removed.

@openjdk
Copy link

openjdk bot commented Dec 16, 2024

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

@GoeLin
Copy link
Member Author

GoeLin commented Dec 17, 2024

Thanks for the review!

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Dec 17, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Dec 17, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Dec 17, 2024

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

  • 30eeb80: 8341978: Improve JButton/bug4490179.java
  • dbf6f67: 8331959: Update PKCS#11 Cryptographic Token Interface to v3.1
  • 6a2ef78: 8339902: Open source couple TextField related tests
  • e8842b7: 8339687: Rearrange reachabilityFence()s in jdk.test.lib.util.ForceGC
  • c609fe5: 8336692: Redo fix for JDK-8284620
  • f44b8ea: 8334777: Test javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java failed with NullPointerException
  • 35f769d: 8333360: PrintNullString.java doesn't use float arguments
  • 539990c: 8328753: Open source few Undecorated Frame tests
  • 2867acd: 8317919: pthread_attr_init handle return value and destroy pthread_attr_t object
  • 3d71029: 8328403: Remove applet usage from JColorChooser tests Test6977726
  • ... and 8 more: https://git.openjdk.org/jdk21u-dev/compare/7b2a675f7061850e27d72c3c8d793fae10b96535...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 17, 2024
@openjdk openjdk bot closed this Dec 17, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 17, 2024
@openjdk
Copy link

openjdk bot commented Dec 17, 2024

@GoeLin Pushed as commit e1b5f3c.

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

@GoeLin GoeLin deleted the goetz_backport_8343314 branch December 17, 2024 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants