X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=796334ffaa616553a6dd765417fddc17ee1d4f5c;hb=b203788ab367147e99df0e95dc9be62cd49c7f45;hp=a07b136bbbbddac3c25791545bf2ddb61b7045ad;hpb=9cf643d1c6524358b231b0f143103aabfa3e5773;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a07b136b..796334ff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,38 +1,74 @@
-SUBDIRS = utils bin lib bindings
+SUBDIRS = utils cli lib bindings plugins
 
-LOG_DRIVER_FLAGS='--merge'
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+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 = bin/test_trace_read \
-	bin/test_trace_read \
-	bin/test_packet_seq_num \
-	bin/test_formats \
-	bin/intersection/test_intersection \
+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_seek_empty_packet \
-	lib/test_seek_big_trace \
 	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_trace_listener \
 	lib/test_bt_notification_heap \
-	lib/test_plugin_complete
+	lib/test_graph_topo \
+	lib/test_cc_prio_map \
+	lib/test_bt_notification_iterator
 
-EXTRA_DIST = $(srcdir)/ctf-traces/** \
-	     $(srcdir)/debug-info-data/** \
-	     $(srcdir)/debug-info-data/.build-id/cd/**
+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 += lib/test_dwarf_complete \
-	lib/test_bin_info_complete
+TESTS_PLUGINS += \
+	plugins/test_dwarf_complete \
+	plugins/test_bin_info_complete
 endif
 
-if USE_PYTHON
-TESTS += bin/intersection/test_multi_trace_intersection.py \
-	lib/writer/test_ctf_writer_no_packet_context.py \
-	lib/writer/test_ctf_writer_empty_packet.py \
-	bindings/python/bt2/testall.sh
+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)))