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

8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test #231

Closed
wants to merge 1 commit into from

Conversation

akashche
Copy link
Contributor

@akashche akashche commented Nov 5, 2021

Clean backport of a JAXP test fix.


Progress

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

Issue

  • JDK-8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 231

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

Using diff file

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

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 5, 2021

👋 Welcome back akasko! 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 7eb0372e55f23275b12470593adc97f1b79bc965 8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test Nov 5, 2021
@openjdk
Copy link

openjdk bot commented Nov 5, 2021

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

@openjdk
Copy link

openjdk bot commented Nov 5, 2021

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

8274606: Fix jaxp/javax/xml/jaxp/unittest/transform/SurrogateTest.java test

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 1 new commit pushed to the master branch:

  • e160532: 8272345: macos doesn't check os::set_boot_path() result

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 added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 5, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 5, 2021

Webrevs

@akashche
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 12, 2021

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

  • 193c7f1: 8274501: c2i entry barriers read int as long on AArch64
  • 3e349b4: 8276025: Hotspot's libsvml.so may conflict with user dependency
  • 58a6dae: 8275872: Sync J2DBench run and analyze Makefile targets with build.xml
  • 7aaad16: 8238649: Call new Win32 API SetThreadDescription in os::set_native_thread_name
  • 16a191c: 8261579: AArch64: Support for weaker memory ordering in Atomic
  • 89a03fe: 8273450: Fix the copyright header of SVML files
  • 6bb5494: 8276572: Fake libsyslookup.so library causes tooling issues
  • 4eeefb4: 8275666: serviceability/jvmti/GetObjectSizeClass.java shouldn't have vm.flagless
  • ed48774: 8274523: java/lang/management/MemoryMXBean/MemoryTest.java test should handle Shenandoah
  • acd939e: 8274522: java/lang/management/ManagementFactory/MXBeanException.java test fails with Shenandoah
  • ... and 10 more: https://git.openjdk.java.net/jdk17u/compare/6d63a86cd981da581c335ecfcf8074be14b9eb5f...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 12, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 12, 2021
@openjdk
Copy link

openjdk bot commented Nov 12, 2021

@akashche Pushed as commit a1036ef.

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

@akashche akashche deleted the 8274606-backport branch November 12, 2021 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

1 participant