From 662514648ee42c5c45fe27a0d4702ef825eb4b16 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 13 Jun 2019 11:22:26 -0400 Subject: [PATCH] Put `flt.lttng-utils.debug-info` tests into their own directory The goal is to have each component class tests in their own directory under `tests/plugins`. Signed-off-by: Philippe Proulx Change-Id: I3f68d2af9087690c6a34d238197c9bb9e96b021c Reviewed-on: https://review.lttng.org/c/babeltrace/+/1423 Tested-by: jenkins Reviewed-by: Michael Jeanson --- .gitignore | 22 +++++------ configure.ac | 19 +++++----- tests/Makefile.am | 18 ++++----- tests/plugins/Makefile.am | 38 ++----------------- .../flt.lttng-utils.debug-info/Makefile.am | 34 +++++++++++++++++ .../test_bin_info.c | 0 .../test_bin_info_i386-linux-gnu.in | 0 .../test_bin_info_powerpc-linux-gnu.in | 0 .../test_bin_info_powerpc64le-linux-gnu.in | 0 .../test_bin_info_x86_64-linux-gnu.in | 0 .../test_dwarf.c | 0 .../test_dwarf_i386-linux-gnu.in | 0 .../test_dwarf_powerpc-linux-gnu.in | 0 .../test_dwarf_powerpc64le-linux-gnu.in | 0 .../test_dwarf_x86_64-linux-gnu.in | 0 .../test_lttng_utils_debug_info.in | 0 .../test_lttng_utils_debug_info.py | 0 17 files changed, 67 insertions(+), 64 deletions(-) create mode 100644 tests/plugins/flt.lttng-utils.debug-info/Makefile.am rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_bin_info.c (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_bin_info_i386-linux-gnu.in (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_bin_info_powerpc-linux-gnu.in (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_bin_info_powerpc64le-linux-gnu.in (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_bin_info_x86_64-linux-gnu.in (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_dwarf.c (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_dwarf_i386-linux-gnu.in (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_dwarf_powerpc-linux-gnu.in (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_dwarf_powerpc64le-linux-gnu.in (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_dwarf_x86_64-linux-gnu.in (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_lttng_utils_debug_info.in (100%) rename tests/plugins/{ => flt.lttng-utils.debug-info}/test_lttng_utils_debug_info.py (100%) diff --git a/.gitignore b/.gitignore index 282fec39..ed858915 100644 --- a/.gitignore +++ b/.gitignore @@ -30,17 +30,17 @@ /tests/lib/test_graph_topo /tests/lib/trace-ir/test_trace_ir /tests/lib/ctf-writer/test_ctf_writer -/tests/plugins/test_lttng_utils_debug_info -/tests/plugins/test_bin_info_i386-linux-gnu -/tests/plugins/test_bin_info_powerpc-linux-gnu -/tests/plugins/test_bin_info_powerpc64le-linux-gnu -/tests/plugins/test_bin_info_x86_64-linux-gnu -/tests/plugins/test_bin_info -/tests/plugins/test_dwarf_i386-linux-gnu -/tests/plugins/test_dwarf_powerpc-linux-gnu -/tests/plugins/test_dwarf_powerpc64le-linux-gnu -/tests/plugins/test_dwarf_x86_64-linux-gnu -/tests/plugins/test_dwarf +/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info +/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu +/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu +/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu +/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu +/tests/plugins/flt.lttng-utils.debug-info/test_bin_info +/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu +/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu +/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu +/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu +/tests/plugins/flt.lttng-utils.debug-info/test_dwarf /tests/plugins/src.ctf.fs/query/test_query /tests/plugins/src.ctf.fs/succeed/test_succeed /tests/plugins/src.ctf.fs/succeed/gen-trace-* diff --git a/configure.ac b/configure.ac index 3d6522db..d6617717 100644 --- a/configure.ac +++ b/configure.ac @@ -785,6 +785,7 @@ AC_CONFIG_FILES([ tests/plugins/Makefile tests/plugins/src.ctf.fs/Makefile tests/plugins/src.ctf.fs/succeed/Makefile + tests/plugins/flt.lttng-utils.debug-info/Makefile tests/utils/common.sh tests/utils/diff.sh tests/utils/Makefile @@ -803,15 +804,15 @@ AC_CONFIG_FILES([tests/lib/test_plugin_complete], [chmod +x tests/lib/test_plugi AC_CONFIG_FILES([tests/lib/trace-ir/test_trace_ir], [chmod +x tests/lib/trace-ir/test_trace_ir]) AC_CONFIG_FILES([tests/plugins/src.ctf.fs/query/test_query], [chmod +x tests/plugins/src.ctf.fs/query/test_query]) AC_CONFIG_FILES([tests/plugins/src.ctf.fs/succeed/test_succeed], [chmod +x tests/plugins/src.ctf.fs/succeed/test_succeed]) -AC_CONFIG_FILES([tests/plugins/test_lttng_utils_debug_info], [chmod +x tests/plugins/test_lttng_utils_debug_info]) -AC_CONFIG_FILES([tests/plugins/test_dwarf_i386-linux-gnu], [chmod +x tests/plugins/test_dwarf_i386-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_dwarf_powerpc-linux-gnu], [chmod +x tests/plugins/test_dwarf_powerpc-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_dwarf_powerpc64le-linux-gnu], [chmod +x tests/plugins/test_dwarf_powerpc64le-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_dwarf_x86_64-linux-gnu], [chmod +x tests/plugins/test_dwarf_x86_64-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_bin_info_i386-linux-gnu], [chmod +x tests/plugins/test_bin_info_i386-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_bin_info_powerpc-linux-gnu], [chmod +x tests/plugins/test_bin_info_powerpc-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_bin_info_powerpc64le-linux-gnu], [chmod +x tests/plugins/test_bin_info_powerpc64le-linux-gnu]) -AC_CONFIG_FILES([tests/plugins/test_bin_info_x86_64-linux-gnu], [chmod +x tests/plugins/test_bin_info_x86_64-linux-gnu]) +AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info]) +AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu]) +AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu]) +AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu]) +AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu]) +AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu]) +AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu]) +AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu]) +AC_CONFIG_FILES([tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu], [chmod +x tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu]) AS_IF([test "x$enable_python_bindings" = xyes], [ diff --git a/tests/Makefile.am b/tests/Makefile.am index 842a3858..60694d93 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -71,21 +71,21 @@ if ENABLE_PYTHON_BINDINGS TESTS_PLUGINS += plugins/src.ctf.fs/query/test_query if ENABLE_DEBUG_INFO -TESTS_PLUGINS += plugins/test_lttng_utils_debug_info +TESTS_PLUGINS += plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info endif endif endif if ENABLE_DEBUG_INFO TESTS_PLUGINS += \ - plugins/test_dwarf_i386-linux-gnu \ - plugins/test_dwarf_powerpc-linux-gnu \ - plugins/test_dwarf_powerpc64le-linux-gnu \ - plugins/test_dwarf_x86_64-linux-gnu \ - plugins/test_bin_info_i386-linux-gnu \ - plugins/test_bin_info_powerpc-linux-gnu \ - plugins/test_bin_info_powerpc64le-linux-gnu \ - plugins/test_bin_info_x86_64-linux-gnu + plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu \ + plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu endif TESTS_PYTHON_PLUGIN_PROVIDER = diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index e748d4fe..a44f0695 100644 --- a/tests/plugins/Makefile.am +++ b/tests/plugins/Makefile.am @@ -1,35 +1,3 @@ -SUBDIRS = src.ctf.fs -AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(top_srcdir)/src/plugins - -LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la - -dist_check_SCRIPTS = \ - test_lttng_utils_debug_info.py - -noinst_PROGRAMS = - -if !ENABLE_BUILT_IN_PLUGINS -# plugin tests here -endif # !ENABLE_BUILT_IN_PLUGINS - -if ENABLE_DEBUG_INFO -noinst_PROGRAMS += test_dwarf test_bin_info - -test_dwarf_LDADD = \ - $(top_builddir)/src/plugins/lttng-utils/debug-info/libdebug-info.la \ - $(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ - $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(ELFUTILS_LIBS) \ - $(LIBTAP) -test_dwarf_SOURCES = test_dwarf.c - -test_bin_info_LDADD = \ - $(top_builddir)/src/plugins/lttng-utils/debug-info/libdebug-info.la \ - $(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la \ - $(top_builddir)/src/logging/libbabeltrace2-logging.la \ - $(top_builddir)/src/common/libbabeltrace2-common.la \ - $(ELFUTILS_LIBS) \ - $(LIBTAP) -test_bin_info_SOURCES = test_bin_info.c -endif # ENABLE_DEBUG_INFO +SUBDIRS = \ + src.ctf.fs \ + flt.lttng-utils.debug-info diff --git a/tests/plugins/flt.lttng-utils.debug-info/Makefile.am b/tests/plugins/flt.lttng-utils.debug-info/Makefile.am new file mode 100644 index 00000000..4c2fdb09 --- /dev/null +++ b/tests/plugins/flt.lttng-utils.debug-info/Makefile.am @@ -0,0 +1,34 @@ +AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(top_srcdir)/src/plugins + +LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la + +dist_check_SCRIPTS = \ + test_lttng_utils_debug_info.py + +noinst_PROGRAMS = + +if !ENABLE_BUILT_IN_PLUGINS +# plugin tests here +endif # !ENABLE_BUILT_IN_PLUGINS + +if ENABLE_DEBUG_INFO +noinst_PROGRAMS += test_dwarf test_bin_info + +test_dwarf_LDADD = \ + $(top_builddir)/src/plugins/lttng-utils/debug-info/libdebug-info.la \ + $(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la \ + $(top_builddir)/src/logging/libbabeltrace2-logging.la \ + $(top_builddir)/src/common/libbabeltrace2-common.la \ + $(ELFUTILS_LIBS) \ + $(LIBTAP) +test_dwarf_SOURCES = test_dwarf.c + +test_bin_info_LDADD = \ + $(top_builddir)/src/plugins/lttng-utils/debug-info/libdebug-info.la \ + $(top_builddir)/src/fd-cache/libbabeltrace2-fd-cache.la \ + $(top_builddir)/src/logging/libbabeltrace2-logging.la \ + $(top_builddir)/src/common/libbabeltrace2-common.la \ + $(ELFUTILS_LIBS) \ + $(LIBTAP) +test_bin_info_SOURCES = test_bin_info.c +endif # ENABLE_DEBUG_INFO diff --git a/tests/plugins/test_bin_info.c b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c similarity index 100% rename from tests/plugins/test_bin_info.c rename to tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c diff --git a/tests/plugins/test_bin_info_i386-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu.in similarity index 100% rename from tests/plugins/test_bin_info_i386-linux-gnu.in rename to tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu.in diff --git a/tests/plugins/test_bin_info_powerpc-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu.in similarity index 100% rename from tests/plugins/test_bin_info_powerpc-linux-gnu.in rename to tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu.in diff --git a/tests/plugins/test_bin_info_powerpc64le-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu.in similarity index 100% rename from tests/plugins/test_bin_info_powerpc64le-linux-gnu.in rename to tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu.in diff --git a/tests/plugins/test_bin_info_x86_64-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu.in similarity index 100% rename from tests/plugins/test_bin_info_x86_64-linux-gnu.in rename to tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu.in diff --git a/tests/plugins/test_dwarf.c b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf.c similarity index 100% rename from tests/plugins/test_dwarf.c rename to tests/plugins/flt.lttng-utils.debug-info/test_dwarf.c diff --git a/tests/plugins/test_dwarf_i386-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu.in similarity index 100% rename from tests/plugins/test_dwarf_i386-linux-gnu.in rename to tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu.in diff --git a/tests/plugins/test_dwarf_powerpc-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu.in similarity index 100% rename from tests/plugins/test_dwarf_powerpc-linux-gnu.in rename to tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu.in diff --git a/tests/plugins/test_dwarf_powerpc64le-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu.in similarity index 100% rename from tests/plugins/test_dwarf_powerpc64le-linux-gnu.in rename to tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu.in diff --git a/tests/plugins/test_dwarf_x86_64-linux-gnu.in b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu.in similarity index 100% rename from tests/plugins/test_dwarf_x86_64-linux-gnu.in rename to tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu.in diff --git a/tests/plugins/test_lttng_utils_debug_info.in b/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.in similarity index 100% rename from tests/plugins/test_lttng_utils_debug_info.in rename to tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.in diff --git a/tests/plugins/test_lttng_utils_debug_info.py b/tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.py similarity index 100% rename from tests/plugins/test_lttng_utils_debug_info.py rename to tests/plugins/flt.lttng-utils.debug-info/test_lttng_utils_debug_info.py -- 2.34.1