Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

8282042: [testbug] FileEncodingTest.java depends on default encoding #96

Closed
wants to merge 1 commit into from

Conversation

backwaterred
Copy link
Contributor

@backwaterred backwaterred commented Apr 8, 2022

Backporting this small testbug fix to jdk18u as requested here

This issue fixes a testbug present on AIX.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8282042: [testbug] FileEncodingTest.java depends on default encoding

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk18u pull/96/head:pull/96
$ git checkout pull/96

Update a local copy of the PR:
$ git checkout pull/96
$ git pull https://git.openjdk.java.net/jdk18u pull/96/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 96

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk18u/pull/96.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 8, 2022

👋 Welcome back backwaterred! 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 58e1882f3ccc648c5f6d216d37cfd1805889b8d8 8282042: [testbug] FileEncodingTest.java depends on default encoding Apr 8, 2022
@openjdk
Copy link

openjdk bot commented Apr 8, 2022

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

@openjdk
Copy link

openjdk bot commented Apr 8, 2022

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

8282042: [testbug] FileEncodingTest.java depends on default encoding

Adds expected encoding "ISO-8859-1" for AIX in FileEncodingTest.java

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

  • d417c34: 8284369: TestFailedAllocationBadGraph fails with -XX:TieredStopAtLevel < 4
  • 9366a80: 8284507: GHA: Only check test results if testing was not skipped
  • db63984: 8284389: Improve stability of GHA Pre-submit testing by caching cygwin installer
  • 430fe80: 8283217: Leak FcObjectSet in getFontConfigLocations() in fontpath.c

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ 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 rfr Pull request is ready for review labels Apr 8, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 8, 2022

Webrevs

@backwaterred
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 12, 2022

@backwaterred
Your change (at version 8cc4db5) is now ready to be sponsored by a Committer.

@backwaterred
Copy link
Contributor Author

@RealCLanger I am looking for a sponsor on this PR, and I see that you are pretty active here. Would you mind taking a look at this one?

Many thanks 🙂

@RealCLanger
Copy link
Contributor

@RealCLanger I am looking for a sponsor on this PR, and I see that you are pretty active here. Would you mind taking a look at this one?

Many thanks 🙂

I was on vacation but this still seems to be open 😄 Doing it now...

/sponsor

@openjdk
Copy link

openjdk bot commented Apr 25, 2022

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 25, 2022
@openjdk openjdk bot closed this Apr 25, 2022
@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 Apr 25, 2022
@openjdk
Copy link

openjdk bot commented Apr 25, 2022

@RealCLanger @backwaterred Pushed as commit 4c325ba.

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

@backwaterred
Copy link
Contributor Author

Thanks @RealCLanger! Hope you had a good time on your vacation 😄

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport clean integrated Pull request has been integrated
2 participants