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

Always build tests

Browse Source 
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.
This commit is contained in:
Kristian Høgsberg
2012-04-11 09:38:29 -04:00
parent 476168ea05
commit 6412718c0d
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
-6
View File
@@ -179,12 +179,6 @@ AC_ARG_ENABLE(tablet-shell, [ --enable-tablet-shell],,
AM_CONDITIONAL(ENABLE_TABLET_SHELL, AM_CONDITIONAL(ENABLE_TABLET_SHELL,
test x$enable_tablet_shell = xyes) 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 if test "x$GCC" = "xyes"; then
GCC_CFLAGS="-Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \ GCC_CFLAGS="-Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
-Wno-unused-parameter -Wno-missing-field-initializers \ -Wno-unused-parameter -Wno-missing-field-initializers \
tests/Makefile.am
+3 -4
View File
@@ -1,9 +1,8 @@
if BUILD_TESTS TESTS = $(check_PROGRAMS)
noinst_PROGRAMS = matrix-test setbacklight check_PROGRAMS = matrix-test
endif
noinst_PROGRAMS = setbacklight
AM_CFLAGS = $(GCC_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src -DUNIT_TEST $(COMPOSITOR_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/src -DUNIT_TEST $(COMPOSITOR_CFLAGS)