From 9f5bdcae95d263f58fa6cf7f16dcf73552ac24da Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 15 Jan 2024 14:22:41 -0500 Subject: [PATCH] tests: rename lib plugins test files Standardize the names for this test a bit. Change-Id: I2d70332ed6f25505aac36be7da7a1bdb63da72b6 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/11678 Reviewed-by: Philippe Proulx Tested-by: jenkins --- configure.ac | 2 +- tests/Makefile.am | 2 +- tests/lib/Makefile.am | 10 +++++----- .../Makefile.am | 0 .../minimal.c | 0 .../sfs.c | 0 tests/lib/{plugin.c => test-plugins.c} | 0 tests/lib/{test-plugin.sh => test-plugins.sh} | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename tests/lib/{test-plugin-plugins => test-plugins-plugins}/Makefile.am (100%) rename tests/lib/{test-plugin-plugins => test-plugins-plugins}/minimal.c (100%) rename tests/lib/{test-plugin-plugins => test-plugins-plugins}/sfs.c (100%) rename tests/lib/{plugin.c => test-plugins.c} (100%) rename tests/lib/{test-plugin.sh => test-plugins.sh} (76%) diff --git a/configure.ac b/configure.ac index 21c82921..53b92cbc 100644 --- a/configure.ac +++ b/configure.ac @@ -822,8 +822,8 @@ AC_CONFIG_FILES([ tests/bitfield/Makefile tests/ctf-writer/Makefile tests/lib/Makefile - tests/lib/test-plugin-plugins/Makefile tests/lib/conds/Makefile + tests/lib/test-plugins-plugins/Makefile tests/lib/utils/Makefile tests/Makefile tests/param-validation/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index baed64e6..90382fb4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -96,7 +96,7 @@ 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 TESTS_PLUGINS = \ diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 643b7e00..9392f900 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -52,14 +52,14 @@ test_remove_destruction_listener_in_destruction_listener_SOURCES = \ 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_plugins_LDADD = $(COMMON_TEST_LDADD) \ $(top_builddir)/src/lib/libbabeltrace2.la -plugin_SOURCES = plugin.c -SUBDIRS += test-plugin-plugins +test_plugins_SOURCES = test-plugins.c +SUBDIRS += test-plugins-plugins endif -dist_check_SCRIPTS = test-plugin.sh test-fields.sh +dist_check_SCRIPTS = test-plugins.sh test-fields.sh if HAVE_PYTHON if DEV_MODE diff --git a/tests/lib/test-plugin-plugins/Makefile.am b/tests/lib/test-plugins-plugins/Makefile.am similarity index 100% rename from tests/lib/test-plugin-plugins/Makefile.am rename to tests/lib/test-plugins-plugins/Makefile.am diff --git a/tests/lib/test-plugin-plugins/minimal.c b/tests/lib/test-plugins-plugins/minimal.c similarity index 100% rename from tests/lib/test-plugin-plugins/minimal.c rename to tests/lib/test-plugins-plugins/minimal.c diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugins-plugins/sfs.c similarity index 100% rename from tests/lib/test-plugin-plugins/sfs.c rename to tests/lib/test-plugins-plugins/sfs.c diff --git a/tests/lib/plugin.c b/tests/lib/test-plugins.c similarity index 100% rename from tests/lib/plugin.c rename to tests/lib/test-plugins.c diff --git a/tests/lib/test-plugin.sh b/tests/lib/test-plugins.sh similarity index 76% rename from tests/lib/test-plugin.sh rename to tests/lib/test-plugins.sh index b9a3fcda..f83e42ba 100755 --- a/tests/lib/test-plugin.sh +++ b/tests/lib/test-plugins.sh @@ -14,4 +14,4 @@ fi # shellcheck source=../utils/utils.sh source "$UTILSSH" -"${BT_TESTS_BUILDDIR}/lib/plugin" "${BT_TESTS_BUILDDIR}/lib/test-plugin-plugins/.libs" +"${BT_TESTS_BUILDDIR}/lib/test-plugins" "${BT_TESTS_BUILDDIR}/lib/test-plugins-plugins/.libs" -- 2.34.1