X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=511b8f373bffbee3a38ca388e88fef04cdb0b11b;hb=9ffc0257721b043158a502d3fcd7eb275630a95b;hp=060ff29d4734a09c868ef325c4e810caf8f4a721;hpb=5b876b066f8c4022939c7ba05c7b6e94a585653d;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 060ff29d..511b8f37 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS = test-plugin-plugins writer .
+SUBDIRS = writer .
 
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
 
@@ -17,8 +17,7 @@ test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la
 
 test_ctf_writer_LDADD = $(COMMON_TEST_LDADD)
 
-test_bt_values_LDADD = $(LIBTAP) \
-	$(top_builddir)/lib/libbabeltrace.la
+test_bt_values_LDADD = $(COMMON_TEST_LDADD)
 
 test_ctf_ir_ref_LDADD = $(COMMON_TEST_LDADD)
 
@@ -28,8 +27,6 @@ test_ir_visit_LDADD = $(COMMON_TEST_LDADD)
 
 test_bt_notification_heap_LDADD = $(COMMON_TEST_LDADD)
 
-test_plugin_LDADD = $(COMMON_TEST_LDADD)
-
 test_graph_topo_LDADD = $(COMMON_TEST_LDADD)
 
 test_cc_prio_map_LDADD = $(COMMON_TEST_LDADD)
@@ -38,7 +35,7 @@ test_bt_notification_iterator_LDADD = $(COMMON_TEST_LDADD)
 
 noinst_PROGRAMS = test_bitfield test_ctf_writer test_bt_values \
 	test_ctf_ir_ref test_bt_ctf_field_type_validation test_ir_visit \
-	test_bt_notification_heap test_plugin test_graph_topo \
+	test_bt_notification_heap test_graph_topo \
 	test_cc_prio_map test_bt_notification_iterator
 
 test_bitfield_SOURCES = test_bitfield.c
@@ -48,13 +45,11 @@ test_ctf_ir_ref_SOURCES = test_ctf_ir_ref.c
 test_bt_ctf_field_type_validation_SOURCES = test_bt_ctf_field_type_validation.c
 test_ir_visit_SOURCES = test_ir_visit.c
 test_bt_notification_heap_SOURCES = test_bt_notification_heap.c
-test_plugin_SOURCES = test_plugin.c
 test_graph_topo_SOURCES = test_graph_topo.c
 test_cc_prio_map_SOURCES = test_cc_prio_map.c
 test_bt_notification_iterator_SOURCES = test_bt_notification_iterator.c
 
-check_SCRIPTS = test_ctf_writer_complete \
-		test_plugin_complete
+check_SCRIPTS = test_ctf_writer_complete
 
 #FIXME
 #if ENABLE_DEBUG_INFO
@@ -73,3 +68,37 @@ check_SCRIPTS = test_ctf_writer_complete \
 #noinst_PROGRAMS += test_dwarf test_bin_info
 #check_SCRIPTS += test_dwarf_complete test_bin_info_complete
 #endif
+
+LOG_DRIVER_FLAGS='--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
+
+TESTS = test_bitfield \
+	test_ctf_writer_complete \
+	test_bt_values \
+	test_ctf_ir_ref \
+	test_bt_ctf_field_type_validation \
+	test_ir_visit \
+	test_bt_notification_heap \
+	test_graph_topo \
+	test_cc_prio_map \
+	test_bt_notification_iterator
+
+if ENABLE_DEBUG_INFO
+TESTS += test_dwarf_complete \
+	test_bin_info_complete
+endif
+
+if ENABLE_PYTHON_BINDINGS
+TESTS +=
+	writer/test_ctf_writer_no_packet_context.py \
+	writer/test_ctf_writer_empty_packet.py
+endif
+
+if !ENABLE_BUILT_IN_PLUGINS
+noinst_PROGRAMS += test_plugin
+test_plugin_LDADD = $(COMMON_TEST_LDADD)
+test_plugin_SOURCES = test_plugin.c
+TESTS += test_plugin_complete
+check_SCRIPTS += test_plugin_complete
+SUBDIRS += test-plugin-plugins
+endif