malloc + memset -> zalloc

[platform/upstream/weston.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b471cc4..d4aa909 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,37 +1,119 @@
-TESTS = surface-test.la client-test.la event-test.la text-test.la
+TESTS = $(shared_tests) $(module_tests) $(weston_tests)
 
-TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-test
+shared_tests = \
+       config-parser.test
 
-export abs_builddir
+module_tests =                         \
+       surface-test.la                 \
+       surface-global-test.la
 
-AM_CFLAGS = $(GCC_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/src -DUNIT_TEST $(COMPOSITOR_CFLAGS)
+weston_tests =                         \
+       keyboard.weston                 \
+       event.weston                    \
+       button.weston                   \
+       text.weston                     \
+       subsurface.weston               \
+       $(xwayland_test)
 
+AM_TESTS_ENVIRONMENT = \
+       abs_builddir='$(abs_builddir)'; export abs_builddir;
 
-check_LTLIBRARIES = $(TESTS)
-check_PROGRAMS = test-client test-text-client
+TEST_EXTENSIONS = .la .weston
+LA_LOG_COMPILER = $(srcdir)/weston-tests-env
+WESTON_LOG_COMPILER = $(srcdir)/weston-tests-env
 
-AM_LDFLAGS = -module -avoid-version -rpath $(libdir)
+clean-local:
+       -rm -rf logs
+
+# To remove when automake 1.11 support is dropped
+export abs_builddir
+
+noinst_LTLIBRARIES =                   \
+       $(weston_test)
 
-test_runner_src = test-runner.c test-runner.h
+noinst_PROGRAMS =                      \
+       $(setbacklight)                 \
+       matrix-test
 
-surface_test_la_SOURCES = surface-test.c $(test_runner_src)
-client_test_la_SOURCES = client-test.c $(test_runner_src)
-event_test_la_SOURCES = event-test.c $(test_runner_src)
-text_test_la_SOURCES = text-test.c $(test_runner_src)
+check_LTLIBRARIES =                    \
+       $(module_tests)
 
-test_client_SOURCES = test-client.c
-test_client_LDADD = $(SIMPLE_CLIENT_LIBS)
+check_PROGRAMS =                       \
+       $(shared_tests)                 \
+       $(weston_tests)
 
-test_text_client_SOURCES = test-text-client.c  ../clients/text-protocol.c
-test_text_client_LDADD = $(SIMPLE_CLIENT_LIBS)
+AM_CFLAGS = $(GCC_CFLAGS)
+AM_CPPFLAGS =                                  \
+       -I$(top_srcdir)/src                     \
+       -I$(top_srcdir)/shared                  \
+       -I$(top_builddir)/src                   \
+       -DUNIT_TEST                             \
+       $(COMPOSITOR_CFLAGS)
+AM_LDFLAGS = -module -avoid-version -rpath $(libdir)
 
-noinst_PROGRAMS = $(setbacklight) matrix-test
+config_parser_test_LDADD =     \
+       ../shared/libshared.la  \
+       $(COMPOSITOR_LIBS)
+config_parser_test_SOURCES =   \
+       config-parser-test.c
+
+surface_global_test_la_SOURCES = surface-global-test.c
+surface_test_la_SOURCES = surface-test.c
+
+weston_test = weston-test.la
+weston_test_la_LIBADD = $(COMPOSITOR_LIBS)     \
+       ../shared/libshared.la
+weston_test_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
+weston_test_la_SOURCES =               \
+       weston-test.c                   \
+       wayland-test-protocol.c         \
+       wayland-test-server-protocol.h
+
+weston_test_runner_src =               \
+       weston-test-runner.c            \
+       weston-test-runner.h
+weston_test_client_src =               \
+       weston-test-client-helper.c     \
+       weston-test-client-helper.h     \
+       wayland-test-protocol.c         \
+       wayland-test-client-protocol.h  \
+       subsurface-protocol.c           \
+       subsurface-client-protocol.h    \
+       $(weston_test_runner_src)
+weston_test_client_libs =              \
+       $(SIMPLE_CLIENT_LIBS)           \
+       ../shared/libshared.la
+
+keyboard_weston_SOURCES = keyboard-test.c $(weston_test_client_src)
+keyboard_weston_LDADD = $(weston_test_client_libs)
+
+event_weston_SOURCES = event-test.c $(weston_test_client_src)
+event_weston_LDADD = $(weston_test_client_libs)
+
+button_weston_SOURCES = button-test.c $(weston_test_client_src)
+button_weston_LDADD = $(weston_test_client_libs)
+
+text_weston_SOURCES =                          \
+       text-test.c                             \
+       ../clients/text-protocol.c              \
+       $(weston_test_client_src)
+text_weston_LDADD = $(weston_test_client_libs)
+
+subsurface_weston_SOURCES = subsurface-test.c $(weston_test_client_src)
+subsurface_weston_LDADD = $(weston_test_client_libs)
+
+xwayland_weston_SOURCES = xwayland-test.c      $(weston_test_client_src)
+
+xwayland_weston_LDADD = $(weston_test_client_libs) $(XWAYLAND_TEST_LIBS)
+
+if ENABLE_XWAYLAND_TEST
+xwayland_test = xwayland.weston
+endif
 
 matrix_test_SOURCES =                          \
        matrix-test.c                           \
-       $(top_srcdir)/src/matrix.c              \
-       $(top_srcdir)/src/matrix.h
+       $(top_srcdir)/shared/matrix.c           \
+       $(top_srcdir)/shared/matrix.h
 matrix_test_LDADD = -lm -lrt
 
 setbacklight_SOURCES =                         \
@@ -46,4 +128,15 @@ if BUILD_SETBACKLIGHT
 setbacklight = setbacklight
 endif
 
-EXTRA_DIST = weston-test
+EXTRA_DIST = weston-tests-env
+
+BUILT_SOURCES =                                        \
+       subsurface-protocol.c                   \
+       subsurface-client-protocol.h            \
+       wayland-test-protocol.c                 \
+       wayland-test-server-protocol.h          \
+       wayland-test-client-protocol.h
+
+CLEANFILES = $(BUILT_SOURCES)
+
+@wayland_scanner_rules@