X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=1ee9fffb49b177c12088df3687af576f5351f76d;hb=5c5632787fc9cafa602c89a28966bcfd01ec0204;hp=2bcc630d6fc0f3479ba2218aa59897dcbc2eb4df;hpb=149bc52e92f860f992d02ca19371ca8d8321f3df;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 2bcc630d..1ee9fffb 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = writer .
+SUBDIRS = ctf-ir ctf-writer
 
 AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
@@ -25,8 +25,6 @@ test_bt_ctf_field_type_validation_LDADD = $(COMMON_TEST_LDADD)
 
 test_ir_visit_LDADD = $(COMMON_TEST_LDADD)
 
-test_bt_notification_heap_LDADD = $(COMMON_TEST_LDADD)
-
 test_graph_topo_LDADD = $(COMMON_TEST_LDADD)
 
 test_cc_prio_map_LDADD = $(COMMON_TEST_LDADD)
@@ -35,8 +33,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_graph_topo \
-	test_cc_prio_map test_bt_notification_iterator
+	test_graph_topo test_cc_prio_map test_bt_notification_iterator
 
 test_bitfield_SOURCES = test_bitfield.c
 test_ctf_writer_SOURCES = test_ctf_writer.c
@@ -44,38 +41,16 @@ 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_bt_notification_heap_SOURCES = test_bt_notification_heap.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
 
-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_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