[PATCH] test: fix event conversion test after de8be07cc0a81

Robert Hooker sarvatt at ubuntu.com
Mon Oct 4 22:49:51 PDT 2010


On Tue, Oct 5, 2010 at 12:18 AM, Peter Hutterer
<peter.hutterer at who-t.net> wrote:
> commit de8be07cc0a8163b6ef04455706fd5ca2cebe587
> Author: Peter Hutterer <peter.hutterer at who-t.net>
> Date:   Tue Aug 17 12:08:52 2010 +1000
>
>    dix: don't create core motion events for non-x/y valuators.
>
> introduces a change in the event generation. the x/y valuator mask bits must
> be set for a core event to be generated. This caused the test to fail.
>
> Reported-by: Robert Hooker <sarvatt at ubuntu.com>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  test/input.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/test/input.c b/test/input.c
> index b90d3b4..f081d44 100644
> --- a/test/input.c
> +++ b/test/input.c
> @@ -185,6 +185,8 @@ static void dix_event_to_core(int type)
>     ev.root     = ROOT_WINDOW_ID;
>     ev.corestate = state;
>     ev.detail.key = detail;
> +    SetBit(ev.valuators.mask, 0);
> +    SetBit(ev.valuators.mask, 1);
>
>     ev.type = type;
>     ev.detail.key = 0;
> --
> 1.7.2.3
>
>

This does indeed fix the build with -enable-unit-tests, thanks!

Build log:
http://launchpadlibrarian.net/57117397/buildlog_ubuntu-maverick-i386.xorg-server_2:1.9.0.901%2Bgit20101005%2Bserver-1.9-branch.8ab87dc7-0ubuntu0sarvatt_BUILDING.txt.gz


More information about the xorg-devel mailing list