X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=f4dc0813023c609db151b6ef2bd87b66da521fc4;hb=cd1c5347f7583a20ece5a1a62fc0e0eddb82322b;hp=6f816f4ba9b080d3539db048afdcb1f4850b0483;hpb=06534d4561d66516d4b1756f37c42cacc5a2a527;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 6f816f4b..f4dc0813 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,54 +45,16 @@ 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
-
-#FIXME
-#if ENABLE_DEBUG_INFO
-#test_dwarf_LDFLAGS = -static
-#test_dwarf_LDADD = $(LIBTAP) \
-#	$(top_builddir)/lib/libbabeltrace.la \
-#	$(top_builddir)/lib/libdebug-info.la
-#test_dwarf_SOURCES = test_dwarf.c
-
-#test_bin_info_LDFLAGS = -static
-#test_bin_info_LDADD = $(LIBTAP) \
-#	$(top_builddir)/lib/libbabeltrace.la \
-#	$(top_builddir)/lib/libdebug-info.la
-#test_bin_info_SOURCES = test_bin_info.c
-
-#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_plugin_complete \
-	test_graph_topo \
-	test_cc_prio_map \
-	test_bt_notification_iterator
-
-if ENABLE_DEBUG_INFO
-TESTS += test_dwarf_complete \
-	test_bin_info_complete
-endif
+check_SCRIPTS = test_ctf_writer_complete
 
-if USE_PYTHON
-TESTS +=
-	writer/test_ctf_writer_no_packet_context.py \
-	writer/test_ctf_writer_empty_packet.py
+if !ENABLE_BUILT_IN_PLUGINS
+noinst_PROGRAMS += test_plugin
+test_plugin_LDADD = $(COMMON_TEST_LDADD)
+test_plugin_SOURCES = test_plugin.c
+check_SCRIPTS += test_plugin_complete
+SUBDIRS += test-plugin-plugins
 endif