Skip to content

Conversation

AlexanderScherbatiy
Copy link

@AlexanderScherbatiy AlexanderScherbatiy commented Mar 31, 2023

This is a backport of the fix from jdk11u-dev repository: openjdk/jdk11u-dev@0ba5a81
The fix is a parity fix for JDK-8298996 in 8u371 from Oracle.

The fix is manually merged with jdk8u-dev because it has conflicts in lines before the fix:
jdk11u-dev: VALID_VS_VERSIONS="2017 2019 2013 2015 2012 2010"
jdk8u-dev: VALID_VS_VERSIONS="2010 2012 2013 2015 2017 2019"
The conflict is resolved so 2022 year is placed after 2019 in jdk8u-dev.

The other part is backported as is into jdk8u-dev. The generated-configure.sh file is updated as well.

To test the fix the jdk8u-dev was built on Windows Server 2012 R2 with:

* Toolchain:      microsoft (Microsoft Visual Studio 2022 17.5.2 (devkit))
* C Compiler:     Version 19.31.31107 (at /cygdrive/c/cygwin64/VS2022-17.5.2-devkit/VC/bin/x64/cl)
* C++ Compiler:   Version 19.31.31107 (at /cygdrive/c/cygwin64/VS2022-17.5.2-devkit/VC/bin/x64/cl)

and hotspot and compact3 tests were run. There were only 3 new failed tests comparing to the build without the fix.

jdk/internal/platform/cgroup/TestCgroupMetrics.java.TestCgroupMetrics
jdk/internal/platform/docker/TestDockerMemoryMetrics.java.TestDockerMemoryMetrics
jdk/internal/platform/docker/TestSystemMetrics.java.TestSystemMetrics

The first test passes after the second run.
I rerun the tests with build without the fix and these 3 tests failed as well.
It looks like that these failures actually are not related to the fix.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 295

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 31, 2023

👋 Welcome back alexsch! 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 0ba5a81e7c0117855665a28a43f9589635e94222 8276841: Add support for Visual Studio 2022 Mar 31, 2023
@openjdk
Copy link

openjdk bot commented Mar 31, 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 rfr Pull request is ready for review labels Mar 31, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 31, 2023

Webrevs

@jerboaa
Copy link
Contributor

jerboaa commented Apr 11, 2023

Could you please run GHA on your fork? I don't see any CI results here.

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine.

@openjdk
Copy link

openjdk bot commented Apr 11, 2023

@AlexanderScherbatiy This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8276841: Add support for Visual Studio 2022

Reviewed-by: sgehwolf

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 the ready Pull request is ready to be integrated label Apr 11, 2023
@openjdk
Copy link

openjdk bot commented Apr 12, 2023

@AlexanderScherbatiy Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@jerboaa
Copy link
Contributor

jerboaa commented Apr 12, 2023

Please ask for approval on the bug.

@AlexanderScherbatiy
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 20, 2023

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

  • cfc654b: 8215105: java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java: Wrong Pixel Color
  • b94b568: 8277881: Missing SessionID in TLS1.3 resumption in compatibility mode
  • 43561ef: 8151460: Metaspace counters can have inconsistent values
  • 721c0ee: 8305113: (tz) Update Timezone Data to 2023c
  • 4445e5c: 8263404: RsaPrivateKeySpec is always recognized as RSAPrivateCrtKeySpec in RSAKeyFactory.engineGetKeySpec

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 20, 2023

@AlexanderScherbatiy Pushed as commit 644e79d.

💡 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 integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants