From cdcb708678c4785cd7b026b90e316691176e5244 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 30 Jul 2013 08:03:12 +1000 Subject: [PATCH] test: fix XIQueryVersion check for new behaviour As of 4360514d1cc8e3132f93f56172d291074e8c770f, XIQueryVersion supports requesting versions 2.2+ in random order, only 2.0 and 2.1 are restricted. Signed-off-by: Peter Hutterer (cherry picked from commit a5abf790183798ad8aa2c29c056df3647777cfbd) --- test/xi2/protocol-xiqueryversion.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c index aff023754..2289c8d7e 100644 --- a/test/xi2/protocol-xiqueryversion.c +++ b/test/xi2/protocol-xiqueryversion.c @@ -96,10 +96,16 @@ reply_XIQueryVersion_multiple(ClientPtr client, int len, char *data, void *closu if (versions->major_cached == -1) { versions->major_cached = rep->major_version; versions->minor_cached = rep->minor_version; + } else if (versions->major_cached >= 2 && + versions->minor_cached >= 2) { + /* First request was for 2.2 or higher, reply + must be 2.2 or higher, whichever requested */ + assert(rep->major_version >= 2); + assert(rep->minor_version >= 2); + } else { + assert(versions->major_cached == rep->major_version); + assert(versions->minor_cached == rep->minor_version); } - - assert(versions->major_cached == rep->major_version); - assert(versions->minor_cached == rep->minor_version); } /**