X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=e6cc483685aa00e897d96d834929745e4910880d;hb=882adb99dca54037e13cab761d20355d2319992f;hp=5927f59eff6a2edee32871a901277661ea9c2f10;hpb=c5db7b7fb7bbd87b3bc70a583a8180c7abcd6420;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5927f59e..e6cc4836 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,34 +1,81 @@
-SUBDIRS = utils bin lib
+SUBDIRS = utils cli lib bindings plugins
 
-EXTRA_DIST = $(srcdir)/ctf-traces/** tests
-if ENABLE_DEBUGINFO
-EXTRA_DIST += $(srcdir)/debuginfo-data/** tests_debuginfo
+# Directories added to EXTRA_DIST will be recursively copied to the distribution.
+EXTRA_DIST = $(srcdir)/ctf-traces \
+	     $(srcdir)/debug-info-data
+
+TESTS_BINDINGS =
+
+if ENABLE_PYTHON_PLUGINS
+SUBDIRS += python-plugin-provider
 endif
 
-SCRIPT_LIST = run.sh
+if ENABLE_PYTHON_BINDINGS
+TESTS_BINDINGS += bindings/python/bt2/test_python_bt2 \
+	bindings/python/babeltrace/test_python_babeltrace
+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_bt_values \
+	lib/test_ctf_writer_complete \
+	lib/test_graph_topo \
+	lib/test_trace_ir_ref
 
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
+if !ENABLE_BUILT_IN_PLUGINS
+TESTS_LIB += lib/test_plugin_complete
+endif
+
+if ENABLE_PYTHON_BINDINGS
+TESTS_LIB += lib/trace-ir/test_trace_ir
+TESTS_LIB += lib/ctf-writer/test_ctf_writer
+endif
 
-all-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			cp -f $(srcdir)/$$script $(builddir); \
-		done; \
-	fi
+TESTS_PLUGINS =
 
-clean-local:
-	@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-		for script in $(SCRIPT_LIST); do \
-			rm -f $(builddir)/$$script; \
-		done; \
-	fi
+if !ENABLE_BUILT_IN_PLUGINS
+if ENABLE_PYTHON_BINDINGS
+TESTS_PLUGINS += plugins/ctf/test_ctf_plugin
 
-TEMPLIST := $(shell mktemp -u)
-check-am:
-	@cat $(srcdir)/tests > $(TEMPLIST)
-if ENABLE_DEBUGINFO
-	@echo '' >> $(TEMPLIST)
-	@cat $(srcdir)/tests_debuginfo >> $(TEMPLIST)
+if ENABLE_DEBUG_INFO
+TESTS_PLUGINS += plugins/test_lttng_utils_debug_info
+endif
+endif
 endif
-	./run.sh $(TEMPLIST)
-	rm $(TEMPLIST)
+
+if ENABLE_DEBUG_INFO
+TESTS_PLUGINS += \
+	plugins/test_dwarf_x86_64-linux-gnu \
+	plugins/test_bin_info_x86_64-linux-gnu
+endif
+
+TESTS_PYTHON_PLUGIN_PROVIDER =
+
+if ENABLE_PYTHON_PLUGINS
+TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider
+endif
+
+LOG_DRIVER_FLAGS = '--merge'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/config/tap-driver.sh
+
+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)))