On 17/08/16 05:04 AM, Adam Jackson wrote:
>
> New commits:
> commit 5c69cb604a144bdced7d066eaca574aa44e8cb36
> Author: Adam Jackson <[email protected]>
> Date: Mon Jun 20 12:57:12 2016 -0400
>
> xinput: Let top-level dispatch generate the error
>
> ... instead of calling SendErrorToClient ourselves.
>
> Signed-off-by: Adam Jackson <[email protected]>
> Reviewed-by: Daniel Stone <[email protected]>
This change broke the xi2/protocol-xiquerypointer test:
protocol-xiquerypointer: ../../../test/xi2/protocol-xiquerypointer.c:145:
request_XIQueryPointer: Assertion `rc == error' failed.
Program received signal SIGABRT, Aborted.
0x00007ffff5b291c8 in __GI_raise (sig=sig@entry=6) at
../sysdeps/unix/sysv/linux/raise.c:54
54 ../sysdeps/unix/sysv/linux/raise.c: No such file or directory.
(gdb) bt
#0 0x00007ffff5b291c8 in __GI_raise (sig=sig@entry=6) at
../sysdeps/unix/sysv/linux/raise.c:54
#1 0x00007ffff5b2a64a in __GI_abort () at abort.c:89
#2 0x00007ffff5b22107 in __assert_fail_base (fmt=<optimized out>,
assertion=assertion@entry=0x591dfc "rc == error", file=file@entry=0x591ba8
"../../../test/xi2/protocol-xiquerypointer.c", line=line@entry=145,
function=function@entry=0x591e10 <__PRETTY_FUNCTION__.16690>
"request_XIQueryPointer") at assert.c:92
#3 0x00007ffff5b221b2 in __GI___assert_fail
(assertion=assertion@entry=0x591dfc "rc == error", file=file@entry=0x591ba8
"../../../test/xi2/protocol-xiquerypointer.c", line=line@entry=145,
function=function@entry=0x591e10 <__PRETTY_FUNCTION__.16690>
"request_XIQueryPointer") at assert.c:101
#4 0x000000000040d38e in request_XIQueryPointer (req=req@entry=0x7fffffffe620,
error=error@entry=0, client=0x806d20 <client_request>) at
../../../test/xi2/protocol-xiquerypointer.c:145
#5 0x000000000040c512 in test_XIQueryPointer () at
../../../test/xi2/protocol-xiquerypointer.c:176
#6 main (argc=<optimized out>, argv=<optimized out>) at
../../../test/xi2/protocol-xiquerypointer.c:215
(gdb) frame 4
#4 0x000000000040d38e in request_XIQueryPointer (req=req@entry=0x7fffffffe620,
error=error@entry=0, client=0x806d20 <client_request>) at
../../../test/xi2/protocol-xiquerypointer.c:145
145 assert(rc == error);
(gdb) l
140
141 client_request.swapped = TRUE;
142 swaps(&req->deviceid);
143 swaps(&req->length);
144 rc = SProcXIQueryPointer(&client_request);
145 assert(rc == error);
146
147 if (rc == BadDevice)
148 assert(client_request.errorValue == req->deviceid);
149 }
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
