X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Flib%2FMakefile.am;h=643b7e000e4543f80e8a85ef0ddc3396afd2d830;hb=cbeb7f03e4e9a56147ca730355cd53c183cce601;hp=f4dc0813023c609db151b6ef2bd87b66da521fc4;hpb=cd1c5347f7583a20ece5a1a62fc0e0eddb82322b;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index f4dc0813..643b7e00 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,60 +1,68 @@
-SUBDIRS = writer .
+# SPDX-License-Identifier: MIT
 
-AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
-
-LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la
-
-libtestcommon_la_SOURCES = common.c common.h
-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.
-COMMON_TEST_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la \
-	$(top_builddir)/lib/libbabeltrace.la
-
-test_bitfield_LDADD = $(LIBTAP) $(builddir)/libtestcommon.la
-
-test_ctf_writer_LDADD = $(COMMON_TEST_LDADD)
-
-test_bt_values_LDADD = $(COMMON_TEST_LDADD)
-
-test_ctf_ir_ref_LDADD = $(COMMON_TEST_LDADD)
-
-test_bt_ctf_field_type_validation_LDADD = $(COMMON_TEST_LDADD)
-
-test_ir_visit_LDADD = $(COMMON_TEST_LDADD)
+SUBDIRS = utils
 
-test_bt_notification_heap_LDADD = $(COMMON_TEST_LDADD)
-
-test_graph_topo_LDADD = $(COMMON_TEST_LDADD)
-
-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_bt_notification_heap 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
-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
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
-check_SCRIPTS = test_ctf_writer_complete
+COMMON_TEST_LDADD = \
+	$(top_builddir)/tests/utils/tap/libtap.la \
+	$(top_builddir)/tests/utils/libtestcommon.la \
+	$(top_builddir)/tests/lib/utils/liblib-utils.la \
+	$(top_builddir)/src/common/libcommon.la \
+	$(top_builddir)/src/logging/liblogging.la
+
+test_bt_values_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
+
+test_fields_bin_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
+
+test_bt_uuid_LDADD = $(COMMON_TEST_LDADD)
+
+test_trace_ir_ref_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la \
+	$(top_builddir)/src/ctf-writer/libbabeltrace2-ctf-writer.la
+
+test_graph_topo_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
+
+test_simple_sink_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
+
+test_remove_destruction_listener_in_destruction_listener_LDADD = \
+	$(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
+
+noinst_PROGRAMS = \
+	test-bt-uuid \
+	test-bt-values \
+	test-graph-topo \
+	test-fields-bin \
+	test-remove-destruction-listener-in-destruction-listener \
+	test-simple-sink \
+	test-trace-ir-ref
+
+test_bt_values_SOURCES = test-bt-values.c
+test_fields_bin_SOURCES = test-fields-bin.cpp
+test_simple_sink_SOURCES = test-simple-sink.c
+test_bt_uuid_SOURCES = test-bt-uuid.c
+test_trace_ir_ref_SOURCES = test-trace-ir-ref.c
+test_graph_topo_SOURCES = test-graph-topo.c
+test_remove_destruction_listener_in_destruction_listener_SOURCES = \
+	test-remove-destruction-listener-in-destruction-listener.c
 
 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
+noinst_PROGRAMS += plugin
+plugin_LDADD = $(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
+plugin_SOURCES = plugin.c
 SUBDIRS += test-plugin-plugins
 endif
+
+dist_check_SCRIPTS = test-plugin.sh test-fields.sh
+
+if HAVE_PYTHON
+if DEV_MODE
+SUBDIRS += conds
+endif
+endif