tests: add role conflict sub-surface vs. wl_shell_surface

Add tests for triggering the role conflict when a wl_surface is already
a wl_shell_surface and then attempted to be made into a sub-surface, and
vice versa.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
diff --git a/Makefile.am b/Makefile.am
index 10be920..1e7cc81 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -851,6 +851,7 @@
 	button.weston				\
 	text.weston				\
 	presentation.weston			\
+	roles.weston				\
 	subsurface.weston
 
 
@@ -960,6 +961,10 @@
 presentation_weston_CFLAGS = $(AM_CFLAGS) $(TEST_CLIENT_CFLAGS)
 presentation_weston_LDADD = libtest-client.la
 
+roles_weston_SOURCES = tests/roles-test.c
+roles_weston_CFLAGS = $(AM_CFLAGS) $(TEST_CLIENT_CFLAGS)
+roles_weston_LDADD = libtest-client.la
+
 if ENABLE_EGL
 weston_tests += buffer-count.weston
 buffer_count_weston_SOURCES = tests/buffer-count-test.c