X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=721244fb3e112a78f2e4acc1f89dbf2ceab2e6ab;hb=ad42b27e87c4fcd6db9762d2da9084650c76d191;hp=c1b68d7ffeb2c978ee3496b0fce678b20da9a87a;hpb=5d7e83594e8aa4f8b465165c05938116279f493d;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index c1b68d7f..721244fb 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,18 +1,22 @@
 # SPDX-License-Identifier: MIT
 
-SUBDIRS =
+SUBDIRS = utils
 
 AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
 COMMON_TEST_LDADD = \
 	$(top_builddir)/tests/utils/tap/libtap.la \
 	$(top_builddir)/tests/utils/libtestcommon.la \
-	$(top_builddir)/src/common/libbabeltrace2-common.la \
-	$(top_builddir)/src/logging/libbabeltrace2-logging.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) \
@@ -30,30 +34,40 @@ test_remove_destruction_listener_in_destruction_listener_LDADD = \
 	$(top_builddir)/src/lib/libbabeltrace2.la
 
 noinst_PROGRAMS = \
-	test_bt_uuid \
-	test_bt_values \
-	test_graph_topo \
-	test_remove_destruction_listener_in_destruction_listener \
-	test_simple_sink \
-	test_trace_ir_ref
-
-test_bt_values_SOURCES = test_bt_values.c
-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-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
+	test-remove-destruction-listener-in-destruction-listener.c
 
 if !ENABLE_BUILT_IN_PLUGINS
-noinst_PROGRAMS += plugin
-plugin_LDADD = $(COMMON_TEST_LDADD) \
+noinst_PROGRAMS += test-plugins test-plugin-init-fail
+SUBDIRS += test-plugins-plugins test-plugin-init-fail-plugin
+
+test_plugins_SOURCES = test-plugins.c
+test_plugins_LDADD = \
+	$(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la
+
+test_plugin_init_fail_SOURCES = test-plugin-init-fail.cpp
+test_plugin_init_fail_LDADD = \
+	$(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/cpp-common/vendor/fmt/libfmt.la \
 	$(top_builddir)/src/lib/libbabeltrace2.la
-plugin_SOURCES = plugin.c
-SUBDIRS += test-plugin-plugins
 endif
 
-dist_check_SCRIPTS = test_plugin
+dist_check_SCRIPTS = test-plugins.sh test-fields.sh
 
 if HAVE_PYTHON
 if DEV_MODE