diff --git a/t/Makefile.am b/t/Makefile.am
index 971b58126d1d756e8fba5f13e5be4977f74a519d..f40d16f97a50f141e5d68e6efe806e5c4c10d174 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
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@
TESTS =
check_PROGRAMS =
-noinst_LTLIBRARIES =
+check_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 \
# integration tests
#
+if INTEGRATION_TESTING
TESTS += integration/simple_config.sh integration/simple_query.sh
+endif
-noinst_LTLIBRARIES += integration/mock_plugin.la
+check_LTLIBRARIES += integration/mock_plugin.la
integration_mock_plugin_la_SOURCES = integration/mock_plugin.c
# -rpath is a work-around to enforce a shared library
integration_mock_plugin_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \