X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=tests%2Flib%2FMakefile.am;h=e389f34b6693c467d087ef26c0cb8dcd1e1bb9ee;hb=9a8ce5a3c9841832a2ae47223c4ee490f0f3bc5d;hp=c462e3c4316c86888dbbac88c98a8be01382e0fd;hpb=1001baa5ad87a3bb98ec136f568dbbaa33944511;p=babeltrace.git

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index c462e3c4..e389f34b 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -1,13 +1,13 @@
 # SPDX-License-Identifier: MIT
 
-SUBDIRS = utils
-
 AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
 
+noinst_LTLIBRARIES =
+
 COMMON_TEST_LDADD = \
 	$(top_builddir)/tests/utils/tap/libtap.la \
 	$(top_builddir)/tests/utils/libtestcommon.la \
-	$(top_builddir)/tests/lib/utils/liblib-utils.la \
+	utils/liblib-utils.la \
 	$(top_builddir)/src/common/libcommon.la \
 	$(top_builddir)/src/logging/liblogging.la
 
@@ -17,7 +17,18 @@ test_bt_values_LDADD = $(COMMON_TEST_LDADD) \
 
 test_fields_bin_SOURCES = test-fields-bin.cpp
 test_fields_bin_LDADD = $(COMMON_TEST_LDADD) \
-	$(top_builddir)/src/lib/libbabeltrace2.la
+	$(top_builddir)/src/lib/libbabeltrace2.la \
+	$(top_builddir)/src/cpp-common/vendor/fmt/libfmt.la
+
+if ENABLE_BUILT_IN_PLUGINS
+
+include $(top_srcdir)/src/Makefile.common.inc
+
+test_fields_bin_LDFLAGS = $(call pluginarchive,utils)
+test_fields_bin_LDADD += \
+	$(top_builddir)/src/plugins/common/param-validation/libparam-validation.la
+
+endif # ENABLE_BUILT_IN_PLUGINS
 
 test_bt_uuid_SOURCES = test-bt-uuid.c
 test_bt_uuid_LDADD = $(COMMON_TEST_LDADD)
@@ -51,25 +62,87 @@ noinst_PROGRAMS = \
 	test-trace-ir-ref
 
 if !ENABLE_BUILT_IN_PLUGINS
-noinst_PROGRAMS += test-plugins test-plugin-init-fail
-SUBDIRS += test-plugins-plugins test-plugin-init-fail-plugin
 
+# test-plugins
+
+noinst_PROGRAMS += test-plugins
 test_plugins_SOURCES = test-plugins.c
 test_plugins_LDADD = \
 	$(COMMON_TEST_LDADD) \
 	$(top_builddir)/src/lib/libbabeltrace2.la
 
+noinst_LTLIBRARIES += test-plugins-plugins/plugin-minimal.la
+test_plugins_plugins_plugin_minimal_la_SOURCES = \
+	test-plugins-plugins/minimal.c
+test_plugins_plugins_plugin_minimal_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	$(LT_NO_UNDEFINED) \
+	-rpath / -avoid-version -module $(LD_NOTEXT)
+test_plugins_plugins_plugin_minimal_la_LIBADD = \
+	$(top_builddir)/src/lib/libbabeltrace2.la \
+	$(top_builddir)/src/common/libcommon.la \
+	$(top_builddir)/src/logging/liblogging.la
+
+noinst_LTLIBRARIES += test-plugins-plugins/plugin-sfs.la
+test_plugins_plugins_plugin_sfs_la_SOURCES = test-plugins-plugins/sfs.c
+test_plugins_plugins_plugin_sfs_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	$(LT_NO_UNDEFINED) \
+	-rpath / -avoid-version -module $(LD_NOTEXT)
+test_plugins_plugins_plugin_sfs_la_LIBADD = \
+	$(top_builddir)/src/lib/libbabeltrace2.la \
+	$(top_builddir)/src/common/libcommon.la \
+	$(top_builddir)/src/logging/liblogging.la
+
+# test-plugin-init-fail
+
+noinst_PROGRAMS +=  test-plugin-init-fail
 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
+
+noinst_LTLIBRARIES += test-plugin-init-fail-plugin/plugin-init-fail.la
+
+test_plugin_init_fail_plugin_plugin_init_fail_la_SOURCES = \
+	test-plugin-init-fail-plugin/plugin-init-fail.cpp
+test_plugin_init_fail_plugin_plugin_init_fail_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	$(LT_NO_UNDEFINED) \
+	-rpath / -avoid-version -module $(LD_NOTEXT)
+test_plugin_init_fail_plugin_plugin_init_fail_la_LIBADD = \
+	$(top_builddir)/src/lib/libbabeltrace2.la
+
 endif
 
 dist_check_SCRIPTS = test-plugins.sh test-fields.sh
 
+# utils
+
+noinst_LTLIBRARIES += utils/liblib-utils.la
+utils_liblib_utils_la_SOURCES = \
+	utils/run-in.cpp \
+	utils/run-in.hpp
+
 if HAVE_PYTHON
 if DEV_MODE
-SUBDIRS += conds
+
+# conds
+
+noinst_PROGRAMS += conds/conds-triggers
+
+conds_conds_triggers_SOURCES = \
+	conds/conds-triggers.cpp \
+	conds/utils.cpp \
+	conds/utils.hpp
+
+conds_conds_triggers_LDADD = \
+	$(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la \
+	$(top_builddir)/src/cpp-common/vendor/fmt/libfmt.la
+
+dist_check_SCRIPTS += conds/test-conds.sh conds/test.py
+
 endif
 endif