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

8286191: misc tests fail due to JDK-8285987 #1321

Closed
wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented May 4, 2023

This is a required follow up of 8285987.

I dropped the changes to the ProblemLists because the tests
are not problem listed in 17.
I added imports to Platform.java because it does not compile.


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/jdk17u-dev.git pull/1321/head:pull/1321
$ git checkout pull/1321

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1321

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 4, 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.

@GoeLin GoeLin changed the base branch from master to pr/1313 May 4, 2023 12:39
@GoeLin GoeLin changed the title Goetz backport 8286191 Backport de8f4d01b234f5224a687dae5db52ab31247c2da May 5, 2023
@openjdk openjdk bot changed the title Backport de8f4d01b234f5224a687dae5db52ab31247c2da 8286191: misc tests fail due to JDK-8285987 May 5, 2023
@openjdk
Copy link

openjdk bot commented May 5, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels May 5, 2023
@mlbridge
Copy link

mlbridge bot commented May 5, 2023

Webrevs

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
Copy link
Contributor

@RealCLanger RealCLanger May 8, 2023

Choose a reason for hiding this comment

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

The copyright reversion here seems wrong. Update: It's also part of the upstream change. So fine for the backport.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1313 to master May 8, 2023 08:16
@openjdk-notifier
Copy link

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 goetz_backport_8286191
git fetch https://git.openjdk.org/jdk17u-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

@openjdk
Copy link

openjdk bot commented May 8, 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:

8286191: misc tests fail due to JDK-8285987

Reviewed-by: mbaesken

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 20 new commits pushed to the master branch:

  • 7dab7e5: 8285987: executing shell scripts without #! fails on Alpine linux
  • 7251548: 8283057: Update GCC to version 11.2.0 for Oracle builds on Linux
  • 6dbd5a6: 8275735: [linux] Remove deprecated Metrics api (kernel memory limit)
  • fc1d3d3: 8304291: [AIX] Broken build after JDK-8301998
  • 31bbf9f: 8306825: Monitor deflation might be accidentally disabled by zero intervals
  • 58c9f6a: 8306774: Make runtime/Monitor/GuaranteedAsyncDeflationIntervalTest.java more reliable
  • 547667d: 8305994: Guarantee eventual async monitor deflation
  • 79aa7b1: 8257856: Make ClassFileVersionsTest.java robust to JDK version updates
  • d8d69f3: 8303508: Vector.lane() gets wrong value on x86
  • 1d7b9ad: 8303069: Memory leak in CompilerOracle::parse_from_line
  • ... and 10 more: https://git.openjdk.org/jdk17u-dev/compare/a4850332065acc2c0713f1bb79cb3b175ab8c213...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 8, 2023
@GoeLin
Copy link
Member Author

GoeLin commented May 8, 2023

/integrate

@openjdk
Copy link

openjdk bot commented May 8, 2023

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

  • 7dab7e5: 8285987: executing shell scripts without #! fails on Alpine linux
  • 7251548: 8283057: Update GCC to version 11.2.0 for Oracle builds on Linux
  • 6dbd5a6: 8275735: [linux] Remove deprecated Metrics api (kernel memory limit)
  • fc1d3d3: 8304291: [AIX] Broken build after JDK-8301998
  • 31bbf9f: 8306825: Monitor deflation might be accidentally disabled by zero intervals
  • 58c9f6a: 8306774: Make runtime/Monitor/GuaranteedAsyncDeflationIntervalTest.java more reliable
  • 547667d: 8305994: Guarantee eventual async monitor deflation
  • 79aa7b1: 8257856: Make ClassFileVersionsTest.java robust to JDK version updates
  • d8d69f3: 8303508: Vector.lane() gets wrong value on x86
  • 1d7b9ad: 8303069: Memory leak in CompilerOracle::parse_from_line
  • ... and 10 more: https://git.openjdk.org/jdk17u-dev/compare/a4850332065acc2c0713f1bb79cb3b175ab8c213...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 8, 2023

@GoeLin Pushed as commit 8c54104.

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

@GoeLin GoeLin deleted the goetz_backport_8286191 branch May 8, 2023 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants