Merge lp://qastaging/~dandrader/frame/lp1025297 into lp://qastaging/frame

Proposed by Daniel d'Andrada
Status: Merged
Merged at revision: 82
Proposed branch: lp://qastaging/~dandrader/frame/lp1025297
Merge into: lp://qastaging/frame
Diff against target: 1378 lines (+1014/-152)
19 files modified
.bzrignore (+4/-3)
Makefile.am (+0/-2)
configure.ac (+12/-4)
m4/gtest.m4 (+51/-0)
src/x11/window_x11.cpp (+21/-41)
src/x11/window_x11.h (+0/-2)
test/Makefile-xorg-gtest.am (+0/-63)
test/Makefile.am (+5/-0)
test/README (+11/-0)
test/gtest/Makefile-xorg-gtest.am (+68/-0)
test/gtest/Makefile.am (+11/-0)
test/integration/Makefile.am (+20/-37)
test/regular/Makefile.am (+57/-0)
test/regular/accept-ended-touch.cpp (+72/-0)
test/regular/frame-fixture.cpp (+161/-0)
test/regular/frame-fixture.h (+31/-0)
test/x11_mocks/Makefile.am (+14/-0)
test/x11_mocks/x11_mocks.cpp (+435/-0)
test/x11_mocks/x11_mocks.h (+41/-0)
To merge this branch: bzr merge lp://qastaging/~dandrader/frame/lp1025297
Reviewer Review Type Date Requested Status
Chase Douglas (community) Approve
Review via email: mp+115357@code.qastaging.launchpad.net

Description of the change

Fixes bug 1025297.

Patch is big because it's adding all the infrastructure needed for mocks-based tests.

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

* The added gtest.m4 file shouldn't have a serial number since it's not distributed anywhere. The serial number implies that it was copied in from some other distribution.

* The Makefile-xorg-gtest.am removal should be reverted. I think you removed it because of issues with the wrong files being included when compiling xorg-gtest itself. This has been fixed in the Makefile-xorg-gtest.am shipped upstream. It has not been fixed in Ubuntu yet, but you can download the change from here:

http://cgit.freedesktop.org/xorg/test/xorg-gtest/commit/?id=3fefcde53f8b69b37baeec61265f2e0190713fe6

Everything else looks good!

review: Needs Fixing
86. By Daniel d'Andrada

Remove serial number from m4/gtest.m4

The serial number implies that it was copied in from some other distribution,
but it's not the case here.

87. By Daniel d'Andrada

Use Makefile-xorg-gtest.am from latest upstream xorg-gtest

Revision history for this message
Daniel d'Andrada (dandrader) wrote :

> * The added gtest.m4 file shouldn't have a serial number since it's not
> distributed anywhere. The serial number implies that it was copied in from
> some other distribution.
>
> * The Makefile-xorg-gtest.am removal should be reverted. I think you removed
> it because of issues with the wrong files being included when compiling xorg-
> gtest itself. This has been fixed in the Makefile-xorg-gtest.am shipped
> upstream. It has not been fixed in Ubuntu yet, but you can download the change
> from here:

Done.

Revision history for this message
Chase Douglas (chasedouglas) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches