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

8289948: Improve test coverage for XPath functions: Node Set Functions #1130

Closed
wants to merge 1 commit into from

Conversation

Rudometov
Copy link
Member

@Rudometov Rudometov commented Jan 31, 2023

Backport of https://bugs.openjdk.org/browse/JDK-8289948
(cherry picked from commit 57bf603b7332db86c39680d16b78f94a904daf46)

Clean backport, parity with 17.0.8-oracle.
Low risk, new test.
Tests passed linux, macos


Progress

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

Issue

  • JDK-8289948: Improve test coverage for XPath functions: Node Set Functions

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1130

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

Using diff file

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

Reviewed-by: joehw
(cherry picked from commit 57bf603b7332db86c39680d16b78f94a904daf46)
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 31, 2023

👋 Welcome back vrudomet! 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 57bf603b7332db86c39680d16b78f94a904daf46 8289948: Improve test coverage for XPath functions: Node Set Functions Jan 31, 2023
@openjdk
Copy link

openjdk bot commented Jan 31, 2023

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

@openjdk
Copy link

openjdk bot commented Jan 31, 2023

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

8289948: Improve test coverage for XPath functions: Node Set Functions

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:

  • 501a4bf: 8298649: JFR: RemoteRecordingStream support for checkpoint event sizes beyond u4
  • 9a992ab: 8277990: NMT: Remove NMT shutdown capability
  • 7b39d48: 8298129: Let checkpoint event sizes grow beyond u4 limit
  • 0e98d6a: 8301397: [11u, 17u] Bump jtreg to fix issue with build JDK 11.0.18

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 Jan 31, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 31, 2023

Webrevs

@Rudometov
Copy link
Member Author

Rudometov commented Jan 31, 2023

Changes are in test/jaxp/javax/xml/jaxp/unittest/xpath/ files.

The failures of github actions are not related to this change.

Windows builds (x64 and aarch64):

/bin/mkdir -p D:/a/jdk17u-dev/jdk17u-dev/jtreg/src/build/classes
CLASSPATH="D:/a/jdk17u-dev/jdk17u-dev/jtreg/src/build/classes;D:/a/jdk17u-dev/jdk17u-dev/jtreg/src/build/deps/jtharness/build/binaries/lib/javatest.jar"
C:/hostedtoolcache/windows/Java_Temurin-Hotspot_jdk/11.0.18-10/x64/bin/javac -source 1.2 -target 1.1 -Xlint:all,-options,-deprecation, -Werror
-d D:/a/jdk17u-dev/jdk17u-dev/jtreg/src/build/classes
-encoding ISO8859-1
../src/share/classes/com/sun/javatest/regtest/agent/AppletWrapper.java ../src/share/classes/com/sun/javatest/regtest/agent/GetSystemProperty.java ../src/share/classes/com/sun/javatest/regtest/agent/MainWrapper.java ../src/share/classes/com/sun/javatest/regtest/agent/AStatus.java ../src/share/classes/com/sun/javatest/regtest/agent/StringArray.java
error: Source option 1.2 is no longer supported. Use 6 or later.
error: Target option 1.1 is no longer supported. Use 1.6 or later.

Similar build failure on macOS:

CLASSPATH="/Users/runner/work/jdk17u-dev/jdk17u-dev/jtreg/src/build/classes:/Users/runner/work/jdk17u-dev/jdk17u-dev/jtreg/src/make/../build/deps/jtharness/build/binaries/lib/javatest.jar"
/Users/runner/hostedtoolcache/Java_Temurin-Hotspot_jdk/11.0.18-10/x64/Contents/Home//bin/javac -source 1.2 -target 1.1 -Xlint:all,-options,-deprecation, -Werror
-d /Users/runner/work/jdk17u-dev/jdk17u-dev/jtreg/src/build/classes
-encoding ISO8859-1
../src/share/classes/com/sun/javatest/regtest/agent/AppletWrapper.java ../src/share/classes/com/sun/javatest/regtest/agent/GetSystemProperty.java ../src/share/classes/com/sun/javatest/regtest/agent/MainWrapper.java ../src/share/classes/com/sun/javatest/regtest/agent/AStatus.java ../src/share/classes/com/sun/javatest/regtest/agent/StringArray.java
error: Source option 1.2 is no longer supported. Use 6 or later.
error: Target option 1.1 is no longer supported. Use 1.6 or later.
make: *** [/Users/runner/work/jdk17u-dev/jdk17u-dev/jtreg/src/build/classes.com.sun.javatest.regtest-othervm.ok] Error 2

@Rudometov
Copy link
Member Author

/integrate

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

openjdk bot commented Jan 31, 2023

@Rudometov
Your change (at version a8f676f) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 1, 2023

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

  • b9e4d10: 8289440: Remove vmTestbase/nsk/monitoring/MemoryPoolMBean/isCollectionUsageThresholdExceeded/isexceeded003 from ProblemList.txt
  • c9fac0e: 8282036: Change java/util/zip/ZipFile/DeleteTempJar.java to stop HttpServer cleanly in case of exceptions
  • 535c64b: 8209935: Test to cover CodeSource.getCodeSigners()
  • 62461a2: 8271838: AmazonCA.java interop test fails
  • 71f53ad: 8286154: Fix 3rd party notices in test files
  • 49a0287: 6779701: Wrong defect ID in the code of test LocalRMIServerSocketFactoryTest.java
  • 501a4bf: 8298649: JFR: RemoteRecordingStream support for checkpoint event sizes beyond u4
  • 9a992ab: 8277990: NMT: Remove NMT shutdown capability
  • 7b39d48: 8298129: Let checkpoint event sizes grow beyond u4 limit
  • 0e98d6a: 8301397: [11u, 17u] Bump jtreg to fix issue with build JDK 11.0.18

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 1, 2023

@phohensee @Rudometov Pushed as commit 83c0805.

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

@Rudometov Rudometov deleted the 8289948 branch February 1, 2023 23:59
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
3 participants