keyboard-test: Use wl_display_roundtrip() instead of yield()
authorKristian Høgsberg <krh@bitplanet.net>
Wed, 12 Dec 2012 03:00:50 +0000 (22:00 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Wed, 12 Dec 2012 03:00:54 +0000 (22:00 -0500)
As for button-test, a wl_display_roundtrip is sufficient here.  The
yield() between wl_test_activate_surface() and wl_test_send_key() is
also not needed, since the two requests will arrive at the server in
order, and will activate the surface first, then send a key event.

tests/keyboard-test.c

index 353dde2..3d5d6e3 100644 (file)
@@ -44,24 +44,22 @@ TEST(simple_keyboard_test)
                        expect_state = WL_KEYBOARD_KEY_STATE_RELEASED;
                        wl_test_send_key(client->test->wl_test, expect_key,
                                expect_state);
-                       yield(client);
                } else if (keyboard->focus) {
                        expect_focus = NULL;
                        wl_test_activate_surface(client->test->wl_test,
                                                 NULL);
-                       yield(client);
                } else if (expect_key < 10) {
                        expect_key++;
                        expect_focus = client->surface;
                        expect_state = WL_KEYBOARD_KEY_STATE_PRESSED;
                        wl_test_activate_surface(client->test->wl_test,
                                                 expect_focus->wl_surface);
-                       yield(client);
                        wl_test_send_key(client->test->wl_test, expect_key,
                                         expect_state);
-                       yield(client);
                } else {
                        break;
                }
+
+               wl_display_roundtrip(client->wl_display);
        }
 }