X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=6f816f4ba9b080d3539db048afdcb1f4850b0483;hb=36712f1d9ad9269638e493ca36a50979fe4da989;hp=d240cbc0e1d9850078ae502b17a5df362e747845;hpb=1323fbeb1654448122d8be64c8813c2b0c2ca4ae;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index d240cbc0..6f816f4b 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = test-plugin-plugins writer .
+
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/tests/utils
 
 LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
@@ -8,14 +10,10 @@ noinst_LTLIBRARIES = libtestcommon.la
 # -Wl,--no-as-needed is needed for recent gold linker who seems to think
 # it knows better and considers libraries with constructors having
 # side-effects as dead code.
-test_seek_LDFLAGS = $(LD_NO_AS_NEEDED)
-COMMON_TEST_LDADD = $(LIBTAP) libtestcommon.a \
-	$(top_builddir)/lib/libbabeltrace.la \
-	$(top_builddir)/formats/ctf/libbabeltrace-ctf.la
-
-test_seek_LDADD = $(COMMON_TEST_LDADD)
+COMMON_TEST_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la \
+	$(top_builddir)/lib/libbabeltrace.la
 
-test_bitfield_LDADD = $(LIBTAP) libtestcommon.a
+test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la
 
 test_ctf_writer_LDADD = $(COMMON_TEST_LDADD)
 
@@ -28,38 +26,76 @@ test_bt_ctf_field_type_validation_LDADD = $(COMMON_TEST_LDADD)
 
 test_ir_visit_LDADD = $(COMMON_TEST_LDADD)
 
-test_trace_listener_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)
 
-noinst_PROGRAMS = test_seek test_bitfield test_ctf_writer test_bt_values \
+test_cc_prio_map_LDADD = $(COMMON_TEST_LDADD)
+
+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_trace_listener
+	test_bt_notification_heap test_plugin test_graph_topo \
+	test_cc_prio_map test_bt_notification_iterator
 
-test_seek_SOURCES = test_seek.c
 test_bitfield_SOURCES = test_bitfield.c
 test_ctf_writer_SOURCES = test_ctf_writer.c
 test_bt_values_SOURCES = test_bt_values.c
 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_trace_listener_SOURCES = test_trace_listener.c
-
-check_SCRIPTS = test_seek_big_trace \
-		test_seek_empty_packet \
-		test_ctf_writer_complete
+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
-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
+TESTS += test_dwarf_complete \
+	test_bin_info_complete
+endif
+
+if USE_PYTHON
+TESTS +=
+	writer/test_ctf_writer_no_packet_context.py \
+	writer/test_ctf_writer_empty_packet.py
 endif