jdk8u-dev
jdk8u-dev copied to clipboard
8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test
This is a backport of JDK-8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test. This patch complements JDK-8268457, which I have already proposed for backporting. #517 This backport is not clean due to the fact that the JDK-8268457 backport is not clean.
I confirmed that SurrogateTest.java fails in the build before applying JDK-8268457 and succeeds in the build after applying it.
Testing: All tests under jdk/test/javax/xml/jaxp/
Thank you.
Progress
- [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [x] Change must not contain extraneous whitespace
- [x] Commit message must refer to an issue
- [x] JDK-8274606 needs maintainer approval
Issue
- JDK-8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test (Bug - P4 - Approved)
Reviewers
- Paul Hohensee (@phohensee - Reviewer) 🔄 Re-review required (review applies to 5346a7ba)
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/518/head:pull/518
$ git checkout pull/518
Update a local copy of the PR:
$ git checkout pull/518
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/518/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 518
View PR using the GUI difftool:
$ git pr show -t 518
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/518.diff
Using Webrev
:wave: Welcome back ktakakuri! A progress list of the required criteria for merging this PR into pr/517 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.
@ktakakuri This change now passes all automated pre-integration checks.
After integration, the commit message for the final commit will be:
8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test
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 59 new commits pushed to the master branch:
- 3e4321d11e557887378d42258be7130878b9ac5e: 8345133: Test sun/security/tools/jarsigner/TsacertOptionTest.java failed: Warning found in stdout
- 55e7ecc26b80b694b378c4d2d64a5e2da815bc48: 8046883: com/sun/jdi/ProcessAttachTest.sh gets "java.io.IOException: Invalid process identifier" on windows
- 73dca05a92e7751006622c33335540300bb2bb4d: 8248001: javadoc generates invalid HTML pages whose ftp:// links are broken
- ... and 56 more: https://git.openjdk.org/jdk8u-dev/compare/2931b1d250dbf820b2094b67f5ae19d223e7c887...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.
This backport pull request has now been updated with issue from the original commit.
GHA test failures appear unrelated.
/approval request This patch complements JDK-8268457, which I have already proposed for backporting. There is a low risk because this backport is a test fix only. I confirmed that SurrogateTest.java fails in the build before applying JDK-8268457 and succeeds in the build after applying it. Testing: All tests under jdk/test/javax/xml/jaxp/
@ktakakuri 8274606: The approval request has been created successfully.
@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
This pull request is pending approval of the Fix Request. I comment to not close.
@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
This pull request is pending approval of the Fix Request. I comment to not close.
@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
This pull request is pending approval of the Fix Request. I comment to not close.
@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
This pull request is pending approval of the Fix Request. I comment to not close.
@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
This pull request is pending approval of the Fix Request. I comment to not close.
The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:
git checkout 8274606
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push
@ktakakuri this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:
git checkout 8274606
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push
I resolved the conflicts.
@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
This pull request is pending approval of the Fix Request. I comment to not close.
@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
This pull request is pending approval of the Fix Request. I comment to not close.
@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!
@ktakakuri This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.
/open
@ktakakuri This pull request is now open
/open
@ktakakuri This pull request is already open