summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-01 17:39:42 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-01 17:41:09 -0700
commit384a32923590df0b58aa7b862ca894f36e3eb502 (patch)
treea61cc1c488af80754d627a92db5d61f0e6680a20 /src
parent3cb9e7003d72adcff0bd1c9ea3cb3038413c8c09 (diff)
Allow xcb tests to end with connection errors
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src')
-rw-r--r--src/xcb_client.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xcb_client.c b/src/xcb_client.c
index e4f7f33..460c036 100644
--- a/src/xcb_client.c
+++ b/src/xcb_client.c
@@ -79,10 +79,12 @@ xhiv_sequence_sync(xcb_connection_t *conn, uint32_t seq) {
}
int
-xhiv_disconnect(xcb_connection_t *conn) {
+xhiv_disconnect(xcb_connection_t *conn, xhiv_connection_error_allowed cea) {
pid_t waitfor;
- assert(xcb_connection_has_error(conn) == 0);
+ if (cea == xhiv_conn_no_error_allowed) {
+ assert(xcb_connection_has_error(conn) == 0);
+ }
xcb_disconnect(conn);
waitfor = server_pid;