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

Fix regression in test definitions #2288

Merged
merged 2 commits into from
Sep 11, 2017
Merged

Fix regression in test definitions #2288

merged 2 commits into from
Sep 11, 2017

Conversation

nirbheek
Copy link
Member

@nirbheek nirbheek commented Sep 7, 2017

Caused by #2236. Also add a test for this.

@nirbheek nirbheek added this to the 0.42.1 milestone Sep 7, 2017
@jpakkane
Copy link
Member

jpakkane commented Sep 9, 2017

Appveyor test failure seems relevant.

Caused by #2236. Also add a test for this.
@jpakkane
Copy link
Member

⚔️ conflicts.

To avoid platform-specific differences in git settings.
@nirbheek
Copy link
Member Author

Looks like tests all pass now.

@jpakkane
Copy link
Member

It's not green yet. 😄

@nirbheek
Copy link
Member Author

That last one is gonna take 5-10 more minutes, so to speed things up I'm going to push the patch to the 0.42 branch in advance :p

Do you want it as two commits or one commit squashed?

@jpakkane jpakkane merged commit e1fc17e into mesonbuild:master Sep 11, 2017
@nirbheek nirbheek deleted the fix-test-regression branch September 11, 2017 21:57
@jpakkane
Copy link
Member

Merged. Feel free to add it to your branch how ever you see fit.

@nirbheek
Copy link
Member Author

The 0.42 branch is all pushed. I'll just test it against my list of repos locally and we can call it a release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants