isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

test: Only run X11-specific code when using X11

Browse Source 
The X11-specific windowing checks were hidden behind an #ifdef, however
if the tests were run under Wayland, they would execute uncondionally
and cause assertion failures.  Fix this by also hiding them behind a
check that the current backend is indeed X11.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone 2012-09-18 10:31:01 +10:00 committed by Rob Bradford
parent 4731a3c47c
commit 13d889814c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/conform/test-conform-common.c
View File

@ -42,10 +42,10 @@ test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture,
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);
} }
}
/* enable XInput support */ /* enable XInput support */
clutter_x11_enable_xinput (); clutter_x11_enable_xinput ();
}
#endif #endif
g_assert (clutter_init (shared_state->argc_addr, shared_state->argv_addr) g_assert (clutter_init (shared_state->argc_addr, shared_state->argv_addr)
@ -60,7 +60,8 @@ test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture,
* later but since the tests are so short lived and may only render * later but since the tests are so short lived and may only render
* a single frame this is not an acceptable semantic. * a single frame this is not an acceptable semantic.
*/ */
XSynchronize (clutter_x11_get_default_display(), TRUE); if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
XSynchronize (clutter_x11_get_default_display(), TRUE);
#endif #endif
} }