diff options
| author | Rodrigo Vivi <rodrigo.vivi@gmail.com> | 2013-02-05 16:17:54 -0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-02-06 12:40:06 +0100 |
| commit | 7c170724003f42cd4ceea9f6c805292bbe2e81b2 (patch) | |
| tree | eb48002192d705a8c35b2c5ed5ac066305740399 | |
| parent | c75b8c60b52cd75f756e59fcfd4ce971e9189509 (diff) | |
Build: Add --disable-tests configure flag to avoid tests build
Tests are still being built by default. However this request
came from OSVs in order to allow them to include i-g-t in their
distributions by default avoiding adding more and more dependencies
since we are improving and adding more and more tests.
v2: wait for Ben's spacing fixes and adjusted for new space rules.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 5ea0fd87..0dd615b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,12 +21,16 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -SUBDIRS = lib man tools scripts tests benchmarks demos +SUBDIRS = lib man tools scripts benchmarks demos if BUILD_SHADER_DEBUGGER SUBDIRS += debugger endif +if BUILD_TESTS +SUBDIRS += tests +endif + test: ${MAKE} -C tests test diff --git a/configure.ac b/configure.ac index 1c56fa49..e66876c5 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,16 @@ AM_CONDITIONAL(BUILD_SHADER_DEBUGGER, [test "x$BUILD_SHADER_DEBUGGER" != xno]) XORG_TESTSET_CFLAG([THREAD_CFLAGS], [-pthread], [-mt]) AC_SUBST([THREAD_CFLAGS]) +AC_ARG_ENABLE(tests, + AS_HELP_STRING([--disable-tests], + [Disable tests build (default: enabled)]), + [BUILD_TESTS=$enableval], [BUILD_TESTS="yes"]) +if test "x$BUILD_TESTS" = xyes; then + AC_DEFINE(BUILD_TESTS, 1, [Build tests]) + AC_CONFIG_FILES([tests/Makefile]) +fi +AM_CONDITIONAL(BUILD_TESTS, [test "x$BUILD_TESTS" = xyes]) + AC_CONFIG_FILES([ Makefile benchmarks/Makefile @@ -129,7 +139,6 @@ AC_CONFIG_FILES([ lib/Makefile man/Makefile scripts/Makefile - tests/Makefile tools/Makefile debugger/Makefile debugger/system_routine/Makefile |