build: Move tests/Makefile.am into toplevel Makefile.am

This commit is contained in:
Kristian Høgsberg 2014-03-07 00:00:18 -08:00
parent 4c163b9b00
commit 7ecb102409
3 changed files with 77 additions and 63 deletions

View File

@ -1,9 +1,7 @@
if BUILD_DOCS
doc_subdir = doc
SUBDIRS = doc
endif
SUBDIRS = $(doc_subdir) . tests
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
aclocaldir = $(datadir)/aclocal
@ -118,3 +116,78 @@ libwayland_cursor_la_CFLAGS = \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
-DICONDIR=\"$(ICONDIR)\"
TESTS = \
array-test \
client-test \
display-test \
connection-test \
event-loop-test \
fixed-test \
list-test \
map-test \
os-wrappers-test \
sanity-test \
socket-test \
queue-test \
signal-test \
resources-test
check_PROGRAMS = \
$(TESTS) \
exec-fd-leak-checker
noinst_PROGRAMS = \
fixed-benchmark
check_LTLIBRARIES = libtest-runner.la
libtest_runner_la_SOURCES = \
tests/test-runner.c \
tests/test-runner.h \
tests/test-helpers.c
libtest_runner_la_LIBADD = \
libwayland-util.la \
libwayland-client.la \
libwayland-server.la \
-lrt -ldl $(FFI_LIBS)
array_test_SOURCES = tests/array-test.c
array_test_LDADD = libtest-runner.la
client_test_SOURCES = tests/client-test.c
client_test_LDADD = libtest-runner.la
display_test_SOURCES = tests/display-test.c
display_test_LDADD = libtest-runner.la
connection_test_SOURCES = tests/connection-test.c
connection_test_LDADD = libtest-runner.la
event_loop_test_SOURCES = tests/event-loop-test.c
event_loop_test_LDADD = libtest-runner.la
fixed_test_SOURCES = tests/fixed-test.c
fixed_test_LDADD = libtest-runner.la
list_test_SOURCES = tests/list-test.c
list_test_LDADD = libtest-runner.la
map_test_SOURCES = tests/map-test.c
map_test_LDADD = libtest-runner.la
sanity_test_SOURCES = tests/sanity-test.c
sanity_test_LDADD = libtest-runner.la
socket_test_SOURCES = tests/socket-test.c
socket_test_LDADD = libtest-runner.la
queue_test_SOURCES = tests/queue-test.c
queue_test_LDADD = libtest-runner.la
signal_test_SOURCES = tests/signal-test.c
signal_test_LDADD = libtest-runner.la
resources_test_SOURCES = tests/resources-test.c
resources_test_LDADD = libtest-runner.la
fixed_benchmark_SOURCES = tests/fixed-benchmark.c
os_wrappers_test_SOURCES = tests/os-wrappers-test.c
os_wrappers_test_LDADD = libtest-runner.la
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS)
exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
exec_fd_leak_checker_LDADD = libtest-runner.la

View File

@ -139,6 +139,5 @@ AC_CONFIG_FILES([Makefile
src/wayland-server.pc
src/wayland-client.pc
src/wayland-scanner.pc
src/wayland-version.h
tests/Makefile])
src/wayland-version.h])
AC_OUTPUT

View File

@ -1,58 +0,0 @@
TESTS = \
array-test \
client-test \
display-test \
connection-test \
event-loop-test \
fixed-test \
list-test \
map-test \
os-wrappers-test \
sanity-test \
socket-test \
queue-test \
signal-test \
resources-test
check_PROGRAMS = \
$(TESTS) \
exec-fd-leak-checker
noinst_PROGRAMS = \
fixed-benchmark
test_runner_src = test-runner.c test-runner.h test-helpers.c
array_test_SOURCES = array-test.c $(test_runner_src)
client_test_SOURCES = client-test.c $(test_runner_src)
display_test_SOURCES = display-test.c $(test_runner_src)
connection_test_SOURCES = connection-test.c $(test_runner_src)
event_loop_test_SOURCES = event-loop-test.c $(test_runner_src)
fixed_test_SOURCES = fixed-test.c $(test_runner_src)
list_test_SOURCES = list-test.c $(test_runner_src)
map_test_SOURCES = map-test.c $(test_runner_src)
sanity_test_SOURCES = sanity-test.c $(test_runner_src)
socket_test_SOURCES = socket-test.c $(test_runner_src)
queue_test_SOURCES = queue-test.c $(test_runner_src)
signal_test_SOURCES = signal-test.c $(test_runner_src)
resources_test_SOURCES = resources-test.c $(test_runner_src)
fixed_benchmark_SOURCES = fixed-benchmark.c
os_wrappers_test_SOURCES = \
os-wrappers-test.c \
../src/wayland-os.c \
$(test_runner_src)
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src
AM_CFLAGS = $(GCC_CFLAGS) $(FFI_CFLAGS)
LDADD = ../libwayland-util.la \
../libwayland-client.la \
../libwayland-server.la \
-lrt -ldl $(FFI_LIBS)
exec_fd_leak_checker_SOURCES = \
exec-fd-leak-checker.c \
test-runner.h \
test-helpers.c
exec_fd_leak_checker_LDADD =