Merged branch 'master' of git://git.tokkee.org/sysdb.

[sysdb.git] / t / Makefile.am

diff --git a/t/Makefile.am b/t/Makefile.am
index 971b58126d1d756e8fba5f13e5be4977f74a519d..43d24d986ba541a8092a4448c50c94974a439502 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -2,7 +2,8 @@ EXTRA_DIST = \
                coverage.sh \
                integration/simple_config.sh \
                integration/simple_query.sh \
-               integration/test_lib.sh
+               integration/test_lib.sh \
+               valgrind.suppress
 
 # coverage related flags are only set when gcov is enabled
 AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@
@@ -17,8 +18,10 @@ noinst_LTLIBRARIES =
 # unit tests
 #
 
+if UNIT_TESTING
 TESTS += unit/libsysdb_test unit/libsysdb_net_test
 check_PROGRAMS += unit/libsysdb_test unit/libsysdb_net_test
+endif
 
 unit_libsysdb_test_SOURCES = \
                unit/libsysdb_test.c unit/libsysdb_test.h \
@@ -51,7 +54,9 @@ unit_libsysdb_net_test_LDADD = $(top_builddir)/src/libsysdb.la @CHECK_LIBS@
 # integration tests
 #
 
+if INTEGRATION_TESTING
 TESTS += integration/simple_config.sh integration/simple_query.sh
+endif
 
 noinst_LTLIBRARIES += integration/mock_plugin.la
 integration_mock_plugin_la_SOURCES = integration/mock_plugin.c