Skip to content
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

8318410: jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh fails on Japanese Windows #1990

Closed
wants to merge 1 commit into from

Conversation

yukikimmura
Copy link
Contributor

@yukikimmura yukikimmura commented Nov 28, 2023

I would like to fix this issue because the test dose not work as intended.
8318410 resolved two issues. However, the first issue related to JEP400 is not relevant to JDK17.
Therefore, I would like to backport only the second issue,
which is the problem of tests not running properly on Windows cygwin.

Could someone please review it?

Thanks,
Kimura Yukihiro


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
  • JDK-8318410 needs maintainer approval

Issue

  • JDK-8318410: jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh fails on Japanese Windows (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1990

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 28, 2023

👋 Welcome back kyukihiro! 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 openjdk bot changed the title Backport d051f22284e7ccc288c658588f73da672d9bfacd 8318410: jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh fails on Japanese Windows Nov 28, 2023
@openjdk
Copy link

openjdk bot commented Nov 28, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 28, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 28, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Nov 29, 2023

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

@yukikimmura
Copy link
Contributor Author

/approval

@openjdk
Copy link

openjdk bot commented Nov 30, 2023

@yukikimmura usage: /approval [<id>] (request|cancel) [<text>]

@yukikimmura
Copy link
Contributor Author

/approval request

@openjdk
Copy link

openjdk bot commented Nov 30, 2023

@yukikimmura
8318410: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Nov 30, 2023
@GoeLin
Copy link
Member

GoeLin commented Dec 1, 2023

Hi @yukikimmura
Please add reason, risk, testing and whether it is a clean backport to your approval request.
See also https://wiki.openjdk.org/display/JDKUpdates/How+to+contribute+or+backport+a+fix
Also, please first backport to 21. I remove the label in the meantime, label again after pushing to 21.

@openjdk openjdk bot removed the approval label Dec 1, 2023
@yukikimmura
Copy link
Contributor Author

Hello Goetz,

Thank you for your comments.
I modified the fix request comment on JBS 8318410.
I will issue the approval request again on this pull request with reason, risk, testing later.
I will backport the fix to 21u first.

Thanks,
Kimura Yukihiro

@yukikimmura
Copy link
Contributor Author

/approval request I would like to backport this issue to 17u,
because the test dose not work as intended on some Windows environment,
and it always fails in regression testing, resulting in extra costs for checking the test results,
The fix does not apply cleanly to 17u because 8318410 resolved two issues,
but the first issue related to JEP400 is not relevant to JDK17,
There is no risk because the fix is the same as JDK22, and I verified the fix enough,
Testing: I tested BootClassPathTest on Windows(English,Japanese) and Linux(LANG/LC_ALL/LC_CTYPE=C,en_US.UTF-8,ja_JP.utf8).

@openjdk
Copy link

openjdk bot commented Dec 21, 2023

@yukikimmura
8318410: The approval request has been updated successfully.

@openjdk openjdk bot added the approval label Dec 21, 2023
@openjdk
Copy link

openjdk bot commented Dec 21, 2023

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

8318410: jdk/java/lang/instrument/BootClassPath/BootClassPathTest.sh fails on Japanese Windows

Reviewed-by: phh

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

  • 38036c1: 8317307: test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails with ConnectException: Connection timed out: no further information
  • 7329c69: 8318955: Add ReleaseIntArrayElements in Java_sun_awt_X11_XlibWrapper_SetBitmapShape XlbWrapper.c to early return
  • d82430b: 8311160: [macOS, Accessibility] VoiceOver: No announcements on JRadioButtonMenuItem and JCheckBoxMenuItem
  • 7e086a2: 8313082: Enable CreateCoredumpOnCrash for testing in makefiles
  • 9d2467b: 8313621: test/jdk/jdk/internal/math/FloatingDecimal/TestFloatingDecimal should use RandomFactory
  • a84f19f: 8263256: Test java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java fails due to dynamic reconfigurations of network interface during test
  • 00d74be: 8314220: Configurable InlineCacheBuffer size
  • 9a104e0: 8318562: Computational test more than 2x slower when AVX instructions are used
  • 5ed1926: 8317507: C2 compilation fails with "Exceeded _node_regs array"
  • 7973bfe: 8321215: Incorrect x86 instruction encoding for VSIB addressing mode
  • ... and 68 more: https://git.openjdk.org/jdk17u-dev/compare/d335f047c15f0732ce15cb037718ad8e862c8b91...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Dec 21, 2023
@yukikimmura
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 21, 2023
@openjdk
Copy link

openjdk bot commented Dec 21, 2023

@yukikimmura
Your change (at version 83d6811) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 22, 2023

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

  • 38036c1: 8317307: test/jdk/com/sun/jndi/ldap/LdapPoolTimeoutTest.java fails with ConnectException: Connection timed out: no further information
  • 7329c69: 8318955: Add ReleaseIntArrayElements in Java_sun_awt_X11_XlibWrapper_SetBitmapShape XlbWrapper.c to early return
  • d82430b: 8311160: [macOS, Accessibility] VoiceOver: No announcements on JRadioButtonMenuItem and JCheckBoxMenuItem
  • 7e086a2: 8313082: Enable CreateCoredumpOnCrash for testing in makefiles
  • 9d2467b: 8313621: test/jdk/jdk/internal/math/FloatingDecimal/TestFloatingDecimal should use RandomFactory
  • a84f19f: 8263256: Test java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java fails due to dynamic reconfigurations of network interface during test
  • 00d74be: 8314220: Configurable InlineCacheBuffer size
  • 9a104e0: 8318562: Computational test more than 2x slower when AVX instructions are used
  • 5ed1926: 8317507: C2 compilation fails with "Exceeded _node_regs array"
  • 7973bfe: 8321215: Incorrect x86 instruction encoding for VSIB addressing mode
  • ... and 68 more: https://git.openjdk.org/jdk17u-dev/compare/d335f047c15f0732ce15cb037718ad8e862c8b91...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 22, 2023

@phohensee @yukikimmura Pushed as commit 4144ef3.

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

@ktakakuri
Copy link
Contributor

/backport jdk8u-dev

@openjdk
Copy link

openjdk bot commented Jan 26, 2024

@ktakakuri To use the /backport command, you need to be in the OpenJDK census and your GitHub account needs to be linked with your OpenJDK username (how to associate your GitHub account with your OpenJDK username).

@ktakakuri
Copy link
Contributor

/backport jdk8u-dev

@openjdk
Copy link

openjdk bot commented Jan 30, 2024

@ktakakuri Could not automatically backport 4144ef36 to openjdk/jdk8u-dev due to conflicts in the following files:

  • jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh
  • jdk/test/java/lang/instrument/BootClassPath/Setup.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk8u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk8u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-ktakakuri-4144ef36

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git 4144ef36bcefb0ba597be9c871b15be5043ad231

# Backport the commit
$ git cherry-pick --no-commit 4144ef36bcefb0ba597be9c871b15be5043ad231
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 4144ef36bcefb0ba597be9c871b15be5043ad231'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk8u-dev with the title Backport 4144ef36bcefb0ba597be9c871b15be5043ad231.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 4144ef36 from the openjdk/jdk17u-dev repository.

The commit being backported was authored by Kimura Yukihiro on 22 Dec 2023 and was reviewed by Paul Hohensee.

Thanks!

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.

4 participants