summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac6
-rw-r--r--src/Makefile.am12
2 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 8586dcdd..411a14d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,12 @@ for flag in $DESIRED_FLAGS ; do
CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"])
done
+dnl Check whether to build tests by default (as compile-test) or not
+AC_ARG_ENABLE([default-build-tests],
+ AS_HELP_STRING([--disable-default-build-tests], [Build test programs only during make check]))
+
+AM_CONDITIONAL([BUILD_TESTS_DEFAULT], [test "x$enable_default_build_tests" = "xno"])
+
# Native atomic operation support
AC_ARG_ENABLE([atomic-arm-linux-helpers],
AS_HELP_STRING([--disable-atomic-arm-linux-helpers],[use inline asm or libatomic_ops instead]),
diff --git a/src/Makefile.am b/src/Makefile.am
index e8f0a820..fbe9e914 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -253,7 +253,7 @@ TESTS = \
lock-autospawn-test \
prioq-test
-noinst_PROGRAMS = \
+TESTS_BINARIES = \
mainloop-test \
mcalign-test \
pacat-simple \
@@ -293,7 +293,7 @@ if HAVE_SIGXCPU
#TESTS += \
# cpulimit-test \
# cpulimit-test2
-noinst_PROGRAMS += \
+TESTS_BINARIES += \
cpulimit-test \
cpulimit-test2
endif
@@ -301,10 +301,16 @@ endif
if HAVE_GLIB20
TESTS += \
mainloop-test-glib
-noinst_PROGRAMS += \
+TESTS_BINARIES += \
mainloop-test-glib
endif
+if BUILD_TESTS_DEFAULT
+noinst_PROGRAMS = $(TESTS_BINARIES)
+else
+check_PROGRAMS = $(TESTS_BINARIES)
+endif
+
mainloop_test_SOURCES = tests/mainloop-test.c
mainloop_test_CFLAGS = $(AM_CFLAGS)
mainloop_test_LDADD = $(AM_LDADD) libpulse.la