mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Add .weston extension to clients tests

Browse Source 
We can then add tests which do not use Weston in the test suite.

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2013-07-08 15:33:25 +02:00 committed by Kristian Høgsberg
parent 7e80f1b656
commit c71cc99c0e
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/.gitignore vendored
View File

@ -1,3 +1,4 @@
*.weston
logs logs
matrix-test matrix-test
setbacklight setbacklight
@ -6,11 +7,5 @@ test-text-client
wayland-test-client-protocol.h wayland-test-client-protocol.h
wayland-test-protocol.c wayland-test-protocol.c
wayland-test-server-protocol.h wayland-test-server-protocol.h
text-test
keyboard-test
event-test
button-test
xwayland-test
subsurface-client-protocol.h subsurface-client-protocol.h
subsurface-protocol.c subsurface-protocol.c
subsurface-test

41
tests/Makefile.am
View File

@ -5,17 +5,19 @@ module_tests = \
surface-global-test.la surface-global-test.la
weston_tests = \ weston_tests = \
keyboard-test \ keyboard.weston \
event-test \ event.weston \
button-test \ button.weston \
text-test \ text.weston \
subsurface-test \ subsurface.weston \
$(xwayland_test) $(xwayland_test)
AM_TESTS_ENVIRONMENT = \ AM_TESTS_ENVIRONMENT = \
abs_builddir='$(abs_builddir)'; export abs_builddir; abs_builddir='$(abs_builddir)'; export abs_builddir;
LOG_COMPILER = $(srcdir)/weston-tests-env TEST_EXTENSIONS = .la .weston
LA_LOG_COMPILER = $(srcdir)/weston-tests-env
WESTON_LOG_COMPILER = $(srcdir)/weston-tests-env
clean-local: clean-local:
-rm -rf logs -rm -rf logs
@ -72,29 +74,30 @@ weston_test_client_libs = \
$(SIMPLE_CLIENT_LIBS) \ $(SIMPLE_CLIENT_LIBS) \
../shared/libshared.la ../shared/libshared.la
keyboard_test_SOURCES = keyboard-test.c $(weston_test_client_src) keyboard_weston_SOURCES = keyboard-test.c $(weston_test_client_src)
keyboard_test_LDADD = $(weston_test_client_libs) keyboard_weston_LDADD = $(weston_test_client_libs)
event_test_SOURCES = event-test.c $(weston_test_client_src) event_weston_SOURCES = event-test.c $(weston_test_client_src)
event_test_LDADD = $(weston_test_client_libs) event_weston_LDADD = $(weston_test_client_libs)
button_test_SOURCES = button-test.c $(weston_test_client_src) button_weston_SOURCES = button-test.c $(weston_test_client_src)
button_test_LDADD = $(weston_test_client_libs) button_weston_LDADD = $(weston_test_client_libs)
text_test_SOURCES = \ text_weston_SOURCES = \
text-test.c \ text-test.c \
../clients/text-protocol.c \ ../clients/text-protocol.c \
$(weston_test_client_src) $(weston_test_client_src)
text_test_LDADD = $(weston_test_client_libs) text_weston_LDADD = $(weston_test_client_libs)
subsurface_test_SOURCES = subsurface-test.c $(weston_test_client_src) subsurface_weston_SOURCES = subsurface-test.c $(weston_test_client_src)
subsurface_test_LDADD = $(weston_test_client_libs) subsurface_weston_LDADD = $(weston_test_client_libs)
xwayland_test_SOURCES = xwayland-test.c $(weston_test_client_src) xwayland_weston_SOURCES = xwayland-test.c $(weston_test_client_src)
xwayland_test_LDADD = $(weston_test_client_libs) $(XWAYLAND_TEST_LIBS)
xwayland_weston_LDADD = $(weston_test_client_libs) $(XWAYLAND_TEST_LIBS)
if ENABLE_XWAYLAND_TEST if ENABLE_XWAYLAND_TEST
xwayland_test = xwayland-test xwayland_test = xwayland.weston
endif endif
matrix_test_SOURCES = \ matrix_test_SOURCES = \