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

new test for Eden events (smaller) #11

Merged
merged 2 commits into from Jun 28, 2016

Conversation

Projects
None yet
3 participants
@jberthold
Contributor

jberthold commented Jul 17, 2015

This is a smaller test for the parallel RTS events
(might also be helpful for @kvelicka as a second test file).

jberthold referenced this pull request Jul 17, 2015

add test for parsing parallel RTS output
Ignore-this: 805674f9d2e9156abf0b6980402c8756

darcs-hash:20120115204620-34406-3c170a97e5fb6a00b3fdac03b99c56daf8d2f336
@kvelicka

This comment has been minimized.

Show comment
Hide comment
@kvelicka

kvelicka Jul 17, 2015

Collaborator

Thanks, having a smaller file would indeed be more convenient but I'd prefer to have this merged in after my changes are in - that should reduce the amount of merge conflicts.

Collaborator

kvelicka commented Jul 17, 2015

Thanks, having a smaller file would indeed be more convenient but I'd prefer to have this merged in after my changes are in - that should reduce the amount of merge conflicts.

@jberthold

This comment has been minimized.

Show comment
Hide comment
@jberthold

jberthold Jul 18, 2015

Contributor

Sure, no problem - (although I don't think there would be any issue with conflicts in this patch).

Contributor

jberthold commented Jul 18, 2015

Sure, no problem - (although I don't think there would be any issue with conflicts in this patch).

@jberthold

This comment has been minimized.

Show comment
Hide comment
@jberthold

jberthold Jun 27, 2016

Contributor

I should have some time this week to look into rebasing this. I cannot see just where the conflict is lurking from the Web UI but I believe it should be straightforward.
Who would be inclined to take care of merging this? @Mikolaj ?

Contributor

jberthold commented Jun 27, 2016

I should have some time this week to look into rebasing this. I cannot see just where the conflict is lurking from the Web UI but I believe it should be straightforward.
Who would be inclined to take care of merging this? @Mikolaj ?

@kvelicka

This comment has been minimized.

Show comment
Hide comment
@kvelicka

kvelicka Jun 28, 2016

Collaborator

Yep, should be fairly straightforward. My hunch is that the conflict's gonna be within the .cabal file and/or TestVersions.hs because they got changed after this PR was submitted. Mikolaj's currently on holiday I believe, but I'll merge the PR as soon as the conflicts are resolved.

Collaborator

kvelicka commented Jun 28, 2016

Yep, should be fairly straightforward. My hunch is that the conflict's gonna be within the .cabal file and/or TestVersions.hs because they got changed after this PR was submitted. Mikolaj's currently on holiday I believe, but I'll merge the PR as soon as the conflicts are resolved.

@jberthold

This comment has been minimized.

Show comment
Hide comment
@jberthold

jberthold Jun 28, 2016

Contributor

OK, this PR is now rebased (and amended to fit the new parser which sorts events by timestamp).

Contributor

jberthold commented Jun 28, 2016

OK, this PR is now rebased (and amended to fit the new parser which sorts events by timestamp).

@kvelicka

This comment has been minimized.

Show comment
Hide comment
@kvelicka

kvelicka Jun 28, 2016

Collaborator

Everything is looking fine and behaviour appears to be the same as with the longer test, so I'm merging this.

Thanks for the PR!

Collaborator

kvelicka commented Jun 28, 2016

Everything is looking fine and behaviour appears to be the same as with the longer test, so I'm merging this.

Thanks for the PR!

@kvelicka kvelicka merged commit 6635386 into haskell:master Jun 28, 2016

@Mikolaj

This comment has been minimized.

Show comment
Hide comment
@Mikolaj

Mikolaj Jul 2, 2016

Member

Thank you guys!

Member

Mikolaj commented Jul 2, 2016

Thank you guys!

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