[PATCH v3 1/3] Add xorg-gtest integration test framework

[Chase Douglas]

On 06/03/2012 11:02 PM, Peter Hutterer wrote:
> On Thu, May 24, 2012 at 10:25:00AM -0700, Chase Douglas wrote:
>> On 05/23/2012 08:32 PM, Peter Hutterer wrote:
>>> pulled the branch you sent me that contained (amongst others) this patchset.
>>>
>>> On Fri, May 18, 2012 at 02:02:04PM -0700, Chase Douglas wrote:
>>>> Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
>>>> ---
>>>> Changes since v2:
>>>> * Refreshed xorg-gtest.m4 and Makefile-xorg-gtest.am for xorg-gtest changes
>>>>
>>>>  configure.ac                            |   21 +++++-
>>>>  m4/xorg-gtest.m4                        |  110 +++++++++++++++++++++++++++++++
>>>>  test/integration/Makefile-xorg-gtest.am |   64 ++++++++++++++++++
>>>>  test/integration/Makefile.am            |    4 ++
>>>
>>> What's missing here is that test/Makefile.am needs integration in the
>>> SUBDIRS, otherwise the tests won't be built.
>>
>> I could have sworn I did this, but I guess not. I've added it in.
>>
>>> and when building them, I get 
>>> xi2.cpp: In member function ‘virtual void
>>> XInput2Test_DisableDeviceEndTouches_Test::TestBody()’:
>>> xi2.cpp:308:177: error: ‘wait_for_device’ was not declared in this scope
>>> xi2.cpp:313:162: error: ‘wait_for_event_of_type’ was not declared in this
>>> scope
>>> xi2.cpp:337:162: error: ‘wait_for_event_of_type’ was not declared in this
>>> scope
>>>
>>> I suspect they are supposed to be in there somewhere, but neither xorg-gtest
>>> nor this tree had it.
>>
>> I fixed up the XIQueryPointer test, but then when I rebased the "end
>> touches on device disable" branch on top I forgot to fix up its test
>> too. I guess I then didn't bother to recompile and test :(. My fault.
>>
>> I'll resend all five patches together so you can review the changes. The
>> branch has been updated if you want to pull:
>>
>> git://people.freedesktop.org/~cndougla/xserver integration-tests
> 
> sigh. after spending some time trying to figure out why tests broke locally
> it turns out that this branch doesn't contain the v5 patches. or at least v5
> 4/5 isn't in there. 

I believe the branch contained v4 of the patches.

> if you want me to pull a branch, please make sure the branch corresponds to
> the state of the latest patches on the list.

Sorry, I sent the v5 patches and didn't update the branch. I never
stated that the branch had the v5 patches. I understand how it was
confusing, and I should have pushed them anyway, but it is the reason
why I forgot to push the branch. Since I never actually said the branch
was updated when I sent the v5 patches, I never made sure I pushed it.

I have updated the branch with the latest patches now. Sorry for the
confusion, and I'll try to be more diligent about pushing branches in
the future.

-- Chase