commit a413ff897da561abfb6986dd9a8ab9bf5238ee50
author Marek Chalupa <mchqwerty@gmail.com> Thu Mar 19 03:35:40 2015 -0400
committer Pekka Paalanen <pekka.paalanen@collabora.co.uk> Thu Mar 19 16:17:20 2015 +0200
tree 8597b180f6b85593c08a3867571ddad05da12c2f
parent 70ac0edcabc110a1cdaf885ba16f999af15f3190

tests: use two roundtrips for global events

first is for getting and binding to globals and the other one is for
getting wl_shm.formats that are emitted after binding
to wl_shm

Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

tests/weston-test-client-helper.c

diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c
index fa11bc1..cf9e742 100644
--- a/tests/weston-test-client-helper.c
+++ b/tests/weston-test-client-helper.c
@@ -579,8 +579,10 @@
 	client->wl_registry = wl_display_get_registry(client->wl_display);
 	wl_registry_add_listener(client->wl_registry, &registry_listener, client);
 
-	/* trigger global listener */
-	wl_display_dispatch(client->wl_display);
+	/* trigger global listener. Need to dispatch two times, because wl_shm
+	 * will emit new events after binding and we need them to arrive
+	 * before continuing */
+	wl_display_roundtrip(client->wl_display);
 	wl_display_roundtrip(client->wl_display);
 
 	/* must have WL_SHM_FORMAT_ARGB32 */