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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

50: Fix failing tests after e8d32c78dc #39

Closed
wants to merge 2 commits into from
Closed

Conversation

@edvbld
Copy link
Member

edvbld commented Aug 7, 2019

Hi all,

this patch fixes some test failures after e8d32c7 was integrated. Turns out there are different bugs in git with regards to unified diffs with zero context 馃槩 @JornVernee fixed the issues with the regular unified diff printer (when there is exactly one parent), this patch works around the issues with git's combined diff printer. The combined diff printer seems to print correct start for empty hunks as long as the file the hunks belong to isn't added.

I also updated a number of tests to take the changes in e8d32c7 into account.

Testing

  • Run sh gradlew test on Linux x86-64

Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Approvers

@openjdk openjdk bot added the rfr label Aug 7, 2019
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 7, 2019

馃憢 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@mlbridge
Copy link

mlbridge bot commented Aug 7, 2019

Webrevs

Copy link
Member

rwestberg left a comment

Looks good, some minor comment change suggestions (one pre-existing).

@openjdk openjdk bot removed the rfr label Aug 7, 2019
@openjdk
Copy link

openjdk bot commented Aug 7, 2019

@edvbld This change can now be integrated. The commit message will be:

50: Fix failing tests after e8d32c78dc

Reviewed-by: rwestberg
  • If you would like to add a summary, use the /summary command.
  • To list additional contributors, use the /contributor command.

Since the source branch of this PR was last updated there have been 2 commits pushed to the master branch:

  • ab9a473: Use the web url in the displayed fetch command
  • 2698709: 22: Wrong lines for comments

Since there are no conflicts, your changes will automatically be rebased on top of the above commits when integrating. If you prefer to do this manually, please merge master into your branch first.

  • To integrate this PR with the above commit message, type /integrate in a new comment.
@openjdk openjdk bot added the ready label Aug 7, 2019
Co-Authored-By: Robin Westberg <robin@westberg.se>
@edvbld
Copy link
Member Author

edvbld commented Aug 7, 2019

Thanks @rwestberg for the comments!

@edvbld
Copy link
Member Author

edvbld commented Aug 7, 2019

/integrate

@openjdk openjdk bot closed this Aug 7, 2019
@openjdk
Copy link

openjdk bot commented Aug 7, 2019

@edvbld The following commits have been pushed to master since your change was applied:

Your commit was automatically rebased without conflicts.
Pushed as commit 8b41fd7.

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

Successfully merging this pull request may close these issues.

None yet

2 participants
You can鈥檛 perform that action at this time.