X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=1b44a9ccbb9711fa0d624f05ddde4bd30ca3a23d;hp=baed64e6644ba98bf6ce6028ea1af2b5cabbf93a;hb=HEAD;hpb=7132b8384f798e2d9d00fee07bba3a56b4ace039

diff --git a/tests/Makefile.am b/tests/Makefile.am
index baed64e6..6136c771 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: MIT
 
+include $(top_srcdir)/src/Makefile.common.inc
+
 SUBDIRS = \
 	utils \
 	lib \
@@ -8,6 +10,13 @@ SUBDIRS = \
 	plugins \
 	param-validation
 
+AM_CPPFLAGS += -I$(top_srcdir)/tests/utils
+
+COMMON_TEST_LDADD = \
+	$(top_builddir)/tests/utils/tap/libtap.la \
+	$(top_builddir)/src/common/libcommon.la \
+	$(top_builddir)/src/logging/liblogging.la
+
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
 EXTRA_DIST = $(srcdir)/data \
 	     bindings/python/bt2/.coveragerc
@@ -63,6 +72,8 @@ dist_check_SCRIPTS = \
 	python-plugin-provider/test-python-plugin-provider.sh \
 	python-plugin-provider/test_python_plugin_provider.py
 
+noinst_PROGRAMS =
+
 TESTS_BINDINGS =
 
 if ENABLE_PYTHON_BINDINGS
@@ -80,6 +91,29 @@ TESTS_CLI = \
 	cli/test-trace-read.sh \
 	cli/test-trimmer.sh
 
+noinst_PROGRAMS += \
+	cpp-common/test-c-string-view
+
+cpp_common_test_c_string_view_SOURCES = \
+	cpp-common/test-c-string-view.cpp
+
+cpp_common_test_c_string_view_LDADD = \
+	$(COMMON_TEST_LDADD)
+
+noinst_PROGRAMS += \
+	cpp-common/test-uuid
+
+cpp_common_test_uuid_SOURCES = \
+	cpp-common/test-uuid.cpp
+
+cpp_common_test_uuid_LDADD = \
+	$(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/cpp-common/vendor/fmt/libfmt.la
+
+TESTS_CPP_COMMON = \
+	cpp-common/test-c-string-view \
+	cpp-common/test-uuid
+
 TESTS_LIB = \
 	lib/test-bt-uuid \
 	lib/test-bt-values \
@@ -96,15 +130,36 @@ TESTS_CTF_WRITER = \
 	ctf-writer/test-ctf-writer.sh
 
 if !ENABLE_BUILT_IN_PLUGINS
-TESTS_LIB += lib/test-plugin.sh
+TESTS_LIB += lib/test-plugins.sh
 endif
 
+# plugins/flt.utils.muxer
+
+noinst_PROGRAMS += plugins/flt.utils.muxer/test-clock-compatibility
+
+plugins_flt_utils_muxer_test_clock_compatibility_SOURCES = \
+	plugins/flt.utils.muxer/test-clock-compatibility.cpp
+
+plugins_flt_utils_muxer_test_clock_compatibility_LDADD = \
+	$(COMMON_TEST_LDADD) \
+	$(top_builddir)/src/lib/libbabeltrace2.la \
+	$(top_builddir)/src/cpp-common/vendor/fmt/libfmt.la
+
+dist_check_SCRIPTS += plugins/flt.utils.muxer/test-clock-compatibility.sh
+
+if ENABLE_BUILT_IN_PLUGINS
+plugins_flt_utils_muxer_test_clock_compatibility_LDFLAGS = $(call pluginarchive,utils)
+plugins_flt_utils_muxer_test_clock_compatibility_LDADD += \
+	$(top_builddir)/src/plugins/common/param-validation/libparam-validation.la
+endif # ENABLE_BUILT_IN_PLUGINS
+
 TESTS_PLUGINS = \
 	plugins/src.ctf.fs/fail/test-fail.sh \
 	plugins/src.ctf.fs/succeed/test-succeed.sh \
 	plugins/src.ctf.fs/test-deterministic-ordering.sh \
 	plugins/sink.ctf.fs/succeed/test-succeed.sh \
-	plugins/sink.text.details/succeed/test-succeed.sh
+	plugins/sink.text.details/succeed/test-succeed.sh \
+	plugins/flt.utils.muxer/test-clock-compatibility.sh
 
 if !ENABLE_BUILT_IN_PLUGINS
 if ENABLE_PYTHON_BINDINGS
@@ -141,7 +196,8 @@ TESTS_CLI += \
 
 TESTS_PLUGINS += plugins/flt.utils.trimmer/test-trimming.sh \
 	plugins/flt.utils.muxer/succeed/test-succeed.sh \
-	plugins/sink.text.pretty/test-enum.sh
+	plugins/sink.text.pretty/test-enum.sh \
+	plugins/src.ctf.fs/field/test-field.sh
 endif
 endif
 
@@ -176,6 +232,7 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
 TESTS_NO_BITFIELD = \
 	$(TESTS_BINDINGS) \
 	$(TESTS_CLI) \
+	$(TESTS_CPP_COMMON) \
 	$(TESTS_CTF_WRITER) \
 	$(TESTS_LIB) \
 	$(TESTS_PARAM_VALIDATION) \
@@ -192,6 +249,7 @@ endef
 $(eval $(call check_target,bindings,$(TESTS_BINDINGS)))
 $(eval $(call check_target,bitfield,$(TESTS_BITFIELD)))
 $(eval $(call check_target,cli,$(TESTS_CLI)))
+$(eval $(call check_target,cpp-common,$(TESTS_CPP_COMMON)))
 $(eval $(call check_target,ctf-writer,$(TESTS_CTF_WRITER)))
 $(eval $(call check_target,lib,$(TESTS_LIB)))
 $(eval $(call check_target,plugins,$(TESTS_PLUGINS)))