Re: [PATCH xserver] test: Fix build dependency for bigreq test

2017-12-11 Thread Eric Anholt
Adam Jackson  writes:

> libxcb-xinput isn't a thing in whichever Ubuntu it is that Travis is
> using. The test is already optional, make it more so.

We should probably be including current xcb in the docker image.  This
seems correct, though:

Reviewed-by: Eric Anholt 


signature.asc
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver] test: Fix build dependency for bigreq test

2017-12-06 Thread Adam Jackson
libxcb-xinput isn't a thing in whichever Ubuntu it is that Travis is
using. The test is already optional, make it more so.

Signed-off-by: Adam Jackson 
---
 test/bigreq/meson.build | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/bigreq/meson.build b/test/bigreq/meson.build
index 9462ede31d..c544703e23 100644
--- a/test/bigreq/meson.build
+++ b/test/bigreq/meson.build
@@ -1,8 +1,10 @@
 xcb_dep = dependency('xcb', required: false)
+xcb_xinput_dep = dependency('xcb-xinput', required: false)
 
 if get_option('xvfb')
-if xcb_dep.found()
-requestlength = executable('request-length', 'request-length.c', 
dependencies: xcb_dep)
+if xcb_dep.found() and xcb_xinput_dep.found()
+requestlength = executable('request-length', 'request-length.c',
+   dependencies: [xcb_dep, xcb_xinput_dep])
 test('request-length', simple_xinit, args: [requestlength, '--', 
xvfb_server])
 endif
 endif
-- 
2.14.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel