Skip to content

Fix broken master #757

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

Merged
merged 2 commits into from
Apr 4, 2017
Merged

Fix broken master #757

merged 2 commits into from
Apr 4, 2017

Conversation

forejtv
Copy link
Contributor

@forejtv forejtv commented Apr 4, 2017

This fixes problems arising from recent merges:

  • problem from one of _start not being renamed.
  • failing test (huge thanks to @thk123 for help on this)

Fixes a simple problem introduced by incompatible changes in PRs #680 and #721
@tautschnig
Copy link
Collaborator

There might be more failures left, but those will indeed be essential.

@tautschnig
Copy link
Collaborator

Bonus points on offer for annotating the commit messages with the commits causing the problem. It should be the coverage-fixes and typedef pull-requests.

This was caused by two PRs being merged concurrently, #519 which introduced
the test and #358 which changed the output when running the test.
@forejtv
Copy link
Contributor Author

forejtv commented Apr 4, 2017

@tautschnig There were no more failures on my local machine, if Travis or AppVeyor complains, I'll also fix those as part of the PR.

I have amended the commit message of the 2nd commit to mention the PRs that were a source of the problem. Unless you or @kroening insist, I won't trace the problem down to specific commits within the PRs.

@kroening kroening merged commit 32a68db into diffblue:master Apr 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants