Skip to content

8279669: test/jdk/com/sun/jdi/TestScaffold.java uses wrong condition #837

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

Closed
wants to merge 1 commit into from

Conversation

zzambers
Copy link
Contributor

@zzambers zzambers commented Feb 23, 2022

Tested locally passed tests in test/jdk/com/sun/jdi for me.


Progress

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

Issue

  • JDK-8279669: test/jdk/com/sun/jdi/TestScaffold.java uses wrong condition

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/837/head:pull/837
$ git checkout pull/837

Update a local copy of the PR:
$ git checkout pull/837
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/837/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 837

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/837.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 23, 2022

👋 Welcome back zzambers! 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 4c52eb39431c2479b0d140907bdcc0311d30f871 8279669: test/jdk/com/sun/jdi/TestScaffold.java uses wrong condition Feb 23, 2022
@openjdk
Copy link

openjdk bot commented Feb 23, 2022

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 Feb 23, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 23, 2022

Webrevs

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.

LGTM. JDK-8206330 is not in 11, thus the hunk to the else branch is not needed.

@openjdk
Copy link

openjdk bot commented Feb 23, 2022

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

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

8279669: test/jdk/com/sun/jdi/TestScaffold.java uses wrong condition

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

  • 4378844: 8254085: javax/swing/text/Caret/TestCaretPositionJTextPane.java failed with "RuntimeException: Wrong caret position"

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. Possible candidates are the reviewers of this PR (@jerboaa) but any other Committer may sponsor as well.

➡️ 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 the ready Pull request is ready to be integrated label Feb 23, 2022
@zzambers
Copy link
Contributor Author

Interestingly for some reason there are some failures in git workflow tests (but nothing related to this change).

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 23, 2022
@openjdk
Copy link

openjdk bot commented Feb 23, 2022

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

@jerboaa
Copy link
Contributor

jerboaa commented Feb 23, 2022

@zzambers Please only integrate once you've got backport approval from an 11u maintainer. Please let me know if you need help with process work. See: https://wiki.openjdk.java.net/display/JDKUpdates/JDK11u for some process documentation.

@zzambers
Copy link
Contributor Author

@jerboaa sorry, I got confused about the process. Can I take it (integration) back?

@jerboaa
Copy link
Contributor

jerboaa commented Feb 24, 2022

@jerboaa sorry, I got confused about the process. Can I take it (integration) back?

No worries. You cannot take it back, but since you need a sponsor for integration it's all fine.

@jerboaa
Copy link
Contributor

jerboaa commented Feb 28, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 28, 2022

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

  • ba6c4c1: 8261107: ArrayIndexOutOfBoundsException in the ICC_Profile.getInstance(InputStream)
  • 80a2777: 8282372: [11] build issue on MacOS/aarch64 12.2.1 using Xcode 13.1: call to 'log2_intptr' is ambiguous
  • 68c6320: 8214004: Missing space between compiler thread name and task info in hs_err
  • 16cbd32: 8250750: JDK-8247515 fix for OSX pc_to_symbol() lookup fails with some symbols
  • 6f9d287: 8277488: Add expiry exception for Digicert (geotrustglobalca) expiring in May 2022
  • ffa5ae8: 8247515: OSX pc_to_symbol() lookup does not work with core files
  • 4378844: 8254085: javax/swing/text/Caret/TestCaretPositionJTextPane.java failed with "RuntimeException: Wrong caret position"

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 28, 2022

@jerboaa @zzambers Pushed as commit 80919eb.

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

@phohensee
Copy link
Member

I can sponsor this, but please check the pre-submit failures first.

@zzambers
Copy link
Contributor Author

zzambers commented Mar 1, 2022

@phohensee I no longer need sponsor, but thank your for your offer.

When it comes to failures:

  • on linux there were some hs/tier1 failures, but as this change only touched test class in jdk tests so I see no connection (also I have noticed same issue for other PRs created at similar time, e.g. [1])
  • on windows it failed to unpack archive with jdk prior to testing (also don't see any possible connection to my change, seems like workflow or system/infrastructure problem)

[1] #833

@phohensee
Copy link
Member

Thanks for checking.

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
Development

Successfully merging this pull request may close these issues.

3 participants