X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=t%2FMakefile.am;h=5de153f16e5718cd9c316c5077dabb8ea5b54868;hp=504e88c957be3f5e37aa0e745614b1a20054d460;hb=56b97a180a53aecbfe9f7162b8ece3faae973cf9;hpb=bb40de500bfe57d044ed45ed66e5d5c38f0818ba

diff --git a/t/Makefile.am b/t/Makefile.am
index 504e88c..5de153f 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -1,4 +1,9 @@
-EXTRA_DIST = coverage.sh
+EXTRA_DIST = \
+		coverage.sh \
+		integration/simple_config.sh \
+		integration/simple_query.sh \
+		integration/test_lib.sh \
+		valgrind.suppress
 
 # coverage related flags are only set when gcov is enabled
 AM_CFLAGS = @STRICT_CFLAGS@ @COVERAGE_CFLAGS@
@@ -7,13 +12,16 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 TESTS =
 check_PROGRAMS =
+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 \
@@ -29,6 +37,7 @@ unit_libsysdb_test_SOURCES = \
 		unit/utils/channel_test.c \
 		unit/utils/dbi_test.c \
 		unit/utils/llist_test.c \
+		unit/utils/os_test.c \
 		unit/utils/strbuf_test.c
 unit_libsysdb_test_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@ -I$(top_srcdir)/t/unit
 unit_libsysdb_test_LDADD = $(top_builddir)/src/libsysdb.la @CHECK_LIBS@
@@ -46,7 +55,15 @@ unit_libsysdb_net_test_LDADD = $(top_builddir)/src/libsysdb.la @CHECK_LIBS@
 # integration tests
 #
 
-TESTS += integration/simple_config.sh
+if INTEGRATION_TESTING
+TESTS += integration/simple_config.sh integration/simple_query.sh
+endif
+
+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 \
+		-rpath /nonexistent
 
 test: check