From cd1c5347f7583a20ece5a1a62fc0e0eddb82322b Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 1 Sep 2017 22:59:01 -0400 Subject: [PATCH] tests: remove `check` targets in subdirectories MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use a single `check` target at the `tests/` level like the project did before to avoid stopping when a subdirectory fails and run all the tests anyway. Use custom targets to run the tests of specific directories (this only works from `tests/`) , for example: make check-cli check-plugins Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- tests/Makefile.am | 65 ++++++++++++++++++++++++ tests/bindings/python/bt2/Makefile.am | 7 --- tests/cli/Makefile.am | 18 ------- tests/lib/Makefile.am | 21 -------- tests/plugins/Makefile.am | 7 --- tests/python-plugin-provider/Makefile.am | 7 --- 6 files changed, 65 insertions(+), 60 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4bdbedd0..796334ff 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,6 +4,71 @@ EXTRA_DIST = $(srcdir)/ctf-traces/** \ $(srcdir)/debug-info-data/** \ $(srcdir)/debug-info-data/.build-id/cd/** +TESTS_BINDINGS = + if ENABLE_PYTHON_PLUGINS SUBDIRS += python-plugin-provider +TESTS_BINDINGS += bindings/python/bt2/test_python_bt2 +endif + +TESTS_CLI = \ + cli/test_trace_read \ + cli/test_packet_seq_num \ + cli/test_convert_args \ + cli/intersection/test_intersection \ + cli/test_trace_copy \ + cli/test_trimmer + +TESTS_LIB = \ + lib/test_bitfield \ + lib/test_ctf_writer_complete \ + lib/test_bt_values \ + lib/test_ctf_ir_ref \ + lib/test_bt_ctf_field_type_validation \ + lib/test_ir_visit \ + lib/test_bt_notification_heap \ + lib/test_graph_topo \ + lib/test_cc_prio_map \ + lib/test_bt_notification_iterator + +if ENABLE_PYTHON_PLUGINS +TESTS_LIB += \ + lib/writer/test_ctf_writer_no_packet_context.py \ + lib/writer/test_ctf_writer_empty_packet.py +endif + +if !ENABLE_BUILT_IN_PLUGINS +TESTS_LIB += lib/test_plugin_complete endif + +TESTS_PLUGINS = + +if !ENABLE_BUILT_IN_PLUGINS +TESTS_PLUGINS += plugins/test-utils-muxer-complete +endif + +if ENABLE_DEBUG_INFO +TESTS_PLUGINS += \ + plugins/test_dwarf_complete \ + plugins/test_bin_info_complete +endif + +TESTS_PYTHON_PLUGIN_PROVIDER = + +if ENABLE_PYTHON_BINDINGS +TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider +endif + +TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_LIB) $(TESTS_PLUGINS) \ + $(TESTS_PYTHON_PLUGIN_PROVIDER) + +define check_target +check-$(1): + $(MAKE) $(AM_MAKEFLAGS) TESTS="$2" check +endef + +$(eval $(call check_target,bindings,$(TESTS_BINDINGS))) +$(eval $(call check_target,cli,$(TESTS_CLI))) +$(eval $(call check_target,lib,$(TESTS_LIB))) +$(eval $(call check_target,plugins,$(TESTS_PLUGINS))) +$(eval $(call check_target,python-plugin-provider,$(TESTS_PYTHON_PLUGIN_PROVIDER))) diff --git a/tests/bindings/python/bt2/Makefile.am b/tests/bindings/python/bt2/Makefile.am index aad80c0c..557cc7b4 100644 --- a/tests/bindings/python/bt2/Makefile.am +++ b/tests/bindings/python/bt2/Makefile.am @@ -20,10 +20,3 @@ EXTRA_DIST = \ test_trace.py \ test_values.py \ .coveragerc - -LOG_DRIVER_FLAGS='--merge' -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh - -if ENABLE_PYTHON_BINDINGS -TESTS = test_python_bt2 -endif diff --git a/tests/cli/Makefile.am b/tests/cli/Makefile.am index d0da8a1b..1191af41 100644 --- a/tests/cli/Makefile.am +++ b/tests/cli/Makefile.am @@ -1,20 +1,2 @@ SUBDIRS = intersection check_SCRIPTS = test_trace_read test_packet_seq_num test_convert_args test_trace_copy - -LOG_DRIVER_FLAGS='--merge' -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh - -TESTS = test_trace_read \ - test_packet_seq_num \ - test_convert_args \ - intersection/test_intersection \ - test_trace_copy \ - test_trimmer - -if ENABLE_DEBUG_INFO -TESTS += test_debug_info -endif - -if ENABLE_PYTHON_BINDINGS -TESTS += intersection/test_multi_trace_intersection.py -endif diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 2bcc630d..f4dc0813 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -51,31 +51,10 @@ test_bt_notification_iterator_SOURCES = test_bt_notification_iterator.c check_SCRIPTS = test_ctf_writer_complete -LOG_DRIVER_FLAGS='--merge' -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh - -TESTS = test_bitfield \ - test_ctf_writer_complete \ - test_bt_values \ - test_ctf_ir_ref \ - test_bt_ctf_field_type_validation \ - test_ir_visit \ - test_bt_notification_heap \ - test_graph_topo \ - test_cc_prio_map \ - test_bt_notification_iterator - -if ENABLE_PYTHON_BINDINGS -TESTS += - writer/test_ctf_writer_no_packet_context.py \ - writer/test_ctf_writer_empty_packet.py -endif - if !ENABLE_BUILT_IN_PLUGINS noinst_PROGRAMS += test_plugin test_plugin_LDADD = $(COMMON_TEST_LDADD) test_plugin_SOURCES = test_plugin.c -TESTS += test_plugin_complete check_SCRIPTS += test_plugin_complete SUBDIRS += test-plugin-plugins endif diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am index 088b28a2..9527a87a 100644 --- a/tests/plugins/Makefile.am +++ b/tests/plugins/Makefile.am @@ -1,8 +1,5 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils -I$(top_srcdir)/plugins -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh -LOG_DRIVER_FLAGS='--merge' - LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la COMMON_TEST_LDADD = $(LIBTAP) \ $(top_builddir)/lib/libbabeltrace.la \ @@ -12,7 +9,6 @@ COMMON_TEST_LDADD = $(LIBTAP) \ check_SCRIPTS = noinst_PROGRAMS = -TESTS = if !ENABLE_BUILT_IN_PLUGINS test_utils_muxer_SOURCES = test-utils-muxer.c @@ -20,7 +16,6 @@ test_utils_muxer_LDADD = $(COMMON_TEST_LDADD) noinst_PROGRAMS += test-utils-muxer check_SCRIPTS += test-utils-muxer-complete -TESTS += test-utils-muxer-complete endif if ENABLE_DEBUG_INFO @@ -42,6 +37,4 @@ test_bin_info_SOURCES = test_bin_info.c noinst_PROGRAMS += test_dwarf test_bin_info check_SCRIPTS += test_dwarf_complete test_bin_info_complete -TESTS += test_dwarf_complete \ - test_bin_info_complete endif diff --git a/tests/python-plugin-provider/Makefile.am b/tests/python-plugin-provider/Makefile.am index 14ac482c..6f72c4c8 100644 --- a/tests/python-plugin-provider/Makefile.am +++ b/tests/python-plugin-provider/Makefile.am @@ -2,10 +2,3 @@ check_SCRIPTS = test_python_plugin_provider EXTRA_DIST = \ test_python_plugin_provider.py \ bt_plugin_test_python_plugin_provider.py - -LOG_DRIVER_FLAGS='--merge' -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh - -if ENABLE_PYTHON_BINDINGS -TESTS = test_python_plugin_provider -endif -- 2.34.1