Skip to content

8280896: java/nio/file/Files/probeContentType/Basic.java fails on Windows 11#1070

Closed
GoeLin wants to merge 1 commit intoopenjdk:masterfrom
openjdk-bots:GoeLin-backport-f9137cb7
Closed

8280896: java/nio/file/Files/probeContentType/Basic.java fails on Windows 11#1070
GoeLin wants to merge 1 commit intoopenjdk:masterfrom
openjdk-bots:GoeLin-backport-f9137cb7

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 16, 2023

I backport this for parity with 17.0.7-oracle.


Progress

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

Issue

  • JDK-8280896: java/nio/file/Files/probeContentType/Basic.java fails on Windows 11

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1070

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 16, 2023

👋 Welcome back goetz! 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 f9137cb7b79f86e96247e7b4bc4abb03857afe75 8280896: java/nio/file/Files/probeContentType/Basic.java fails on Windows 11 Jan 16, 2023
@openjdk
Copy link

openjdk bot commented Jan 16, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Jan 16, 2023
@openjdk
Copy link

openjdk bot commented Jan 16, 2023

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

8280896: java/nio/file/Files/probeContentType/Basic.java fails on Windows 11

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Jan 16, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 16, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jan 18, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 18, 2023

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

  • 1572e77: 8283719: java/util/logging/CheckZombieLockTest.java failing intermittently
  • 48b8fec: 8283717: vmTestbase/nsk/jdi/ThreadStartEvent/thread/thread001 failed due to SocketTimeoutException
  • cc56820: 8296389: C2: PhaseCFG::convert_NeverBranch_to_Goto must handle both orders of successors
  • 1d6db44: 8297642: PhaseIdealLoop::only_has_infinite_loops must detect all loops that never lead to termination
  • b5c7a6f: 8290850: C2: create_new_if_for_predicate() does not clone pinned phi input nodes resulting in a broken graph
  • 127f3eb: 8278961: Enable debug logging in java/net/DatagramSocket/SendDatagramToBadAddress.java
  • 044eb4e: 8273154: Provide a JavadocTester method for non-overlapping, unordered output matching
  • 5872c77: 8254267: javax/xml/crypto/dsig/LogParameters.java failed with "RuntimeException: Unexpected log output:"

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 18, 2023

@GoeLin Pushed as commit 7d6adf2.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant