diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2012-04-11 09:38:29 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-04-11 09:38:32 -0400 |
| commit | 6412718c0d8ac7edb1b88f539f37bfa563724ca5 (patch) | |
| tree | f1aaca864d3d77f367e171d04c2023bbd6afb1ad | |
| parent | 476168ea05d7b32e821320de367abde9e9f7b10e (diff) | |
Always build tests
There are no dependencies or requirements there that we don't already
need for weston itself. So lets just always build them.
Use check_PROGRAMS for the matrix unit test case.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | tests/Makefile.am | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 038e6198..6da79224 100644 --- a/configure.ac +++ b/configure.ac @@ -179,12 +179,6 @@ AC_ARG_ENABLE(tablet-shell, [ --enable-tablet-shell],, AM_CONDITIONAL(ENABLE_TABLET_SHELL, test x$enable_tablet_shell = xyes) -AC_ARG_ENABLE(tests, - AS_HELP_STRING([--disable-tests], - [do not build unit tests [default=enabled]]),, - enable_tests=yes) -AM_CONDITIONAL(BUILD_TESTS, test x$enable_tests = xyes) - if test "x$GCC" = "xyes"; then GCC_CFLAGS="-Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \ -Wno-unused-parameter -Wno-missing-field-initializers \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 1df2c79c..f9c47545 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,9 +1,8 @@ -if BUILD_TESTS +TESTS = $(check_PROGRAMS) -noinst_PROGRAMS = matrix-test setbacklight - -endif +check_PROGRAMS = matrix-test +noinst_PROGRAMS = setbacklight AM_CFLAGS = $(GCC_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/src -DUNIT_TEST $(COMPOSITOR_CFLAGS) |