From: Simon Marchi Date: Sun, 11 Feb 2024 05:03:01 +0000 (-0500) Subject: tests/lib: remove some `Makefile.am`s X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=b93af5a2d22e36cf547da1739d60e19791daccbd tests/lib: remove some `Makefile.am`s Move the content of all Makefiles under `tests/lib` to `tests/lib/Makefile.am`. Change-Id: I114ef3a534bafecd205f310891f2c90f3e40d334 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/11779 Tested-by: jenkins Reviewed-by: Philippe Proulx --- diff --git a/configure.ac b/configure.ac index b7bae8ff..fa21a881 100644 --- a/configure.ac +++ b/configure.ac @@ -822,10 +822,6 @@ AC_CONFIG_FILES([ tests/bitfield/Makefile tests/ctf-writer/Makefile tests/lib/Makefile - tests/lib/conds/Makefile - tests/lib/test-plugin-init-fail-plugin/Makefile - tests/lib/test-plugins-plugins/Makefile - tests/lib/utils/Makefile tests/Makefile tests/param-validation/Makefile tests/plugins/Makefile diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index c462e3c4..3f3273b3 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 @@ -51,25 +51,86 @@ 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 + +dist_check_SCRIPTS += conds/test-conds.sh conds/test.py + endif endif diff --git a/tests/lib/conds/Makefile.am b/tests/lib/conds/Makefile.am deleted file mode 100644 index b380b009..00000000 --- a/tests/lib/conds/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: MIT - -AM_CPPFLAGS += -I$(top_srcdir)/tests/utils - -conds_triggers_SOURCES = \ - conds-triggers.cpp \ - utils.cpp utils.hpp - -conds_triggers_LDADD = \ - $(top_builddir)/tests/lib/utils/liblib-utils.la \ - $(top_builddir)/src/common/libcommon.la \ - $(top_builddir)/src/logging/liblogging.la \ - $(top_builddir)/src/lib/libbabeltrace2.la - -noinst_PROGRAMS = conds-triggers - -dist_check_SCRIPTS = test-conds.sh test.py diff --git a/tests/lib/test-plugin-init-fail-plugin/Makefile.am b/tests/lib/test-plugin-init-fail-plugin/Makefile.am deleted file mode 100644 index fb20778e..00000000 --- a/tests/lib/test-plugin-init-fail-plugin/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = plugin-init-fail.la - -plugin_init_fail_la_SOURCES = plugin-init-fail.cpp -plugin_init_fail_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(LT_NO_UNDEFINED) \ - -rpath / -avoid-version -module $(LD_NOTEXT) -plugin_init_fail_la_LIBADD = \ - $(top_builddir)/src/lib/libbabeltrace2.la diff --git a/tests/lib/test-plugins-plugins/Makefile.am b/tests/lib/test-plugins-plugins/Makefile.am deleted file mode 100644 index 7c1ae9d6..00000000 --- a/tests/lib/test-plugins-plugins/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: MIT - -noinst_LTLIBRARIES = plugin-minimal.la plugin-sfs.la - -# the minimal plugin -plugin_minimal_la_SOURCES = minimal.c -plugin_minimal_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(LT_NO_UNDEFINED) \ - -rpath / -avoid-version -module $(LD_NOTEXT) -plugin_minimal_la_LIBADD = \ - $(top_builddir)/src/lib/libbabeltrace2.la \ - $(top_builddir)/src/common/libcommon.la \ - $(top_builddir)/src/logging/liblogging.la - -# source/filter/sink plugin -plugin_sfs_la_SOURCES = sfs.c -plugin_sfs_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(LT_NO_UNDEFINED) \ - -rpath / -avoid-version -module $(LD_NOTEXT) -plugin_sfs_la_LIBADD = \ - $(top_builddir)/src/lib/libbabeltrace2.la \ - $(top_builddir)/src/common/libcommon.la \ - $(top_builddir)/src/logging/liblogging.la diff --git a/tests/lib/utils/Makefile.am b/tests/lib/utils/Makefile.am deleted file mode 100644 index 21d90175..00000000 --- a/tests/lib/utils/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -noinst_LTLIBRARIES = liblib-utils.la -liblib_utils_la_SOURCES = run-in.cpp run-in.hpp