X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=db0ecaef828c498c07bdd035490c5ec45fb6ac02;hb=86f2cc9eeb65093fc55cc18edc4e22d0704b85f9;hp=5ffd0e0c959f45214df386ceda95c4fa6cc3226b;hpb=21d04293d33d222b3e6583658040871d699033c3;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5ffd0e0c..db0ecaef 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,11 +1,10 @@
-SUBDIRS = utils lib ctf-writer plugins
+SUBDIRS = utils lib bitfield ctf-writer plugins
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
 EXTRA_DIST = $(srcdir)/data \
 	     bindings/python/bt2/.coveragerc
 
 dist_check_SCRIPTS = \
-	bindings/python/bt2/test_clock_class_priority_map.py \
 	bindings/python/bt2/test_clock_class.py \
 	bindings/python/bt2/test_component_class.py \
 	bindings/python/bt2/test_component.py \
@@ -55,11 +54,14 @@ TESTS_CLI = \
 	cli/test_trimmer
 
 TESTS_LIB = \
-	lib/test_bitfield \
 	lib/test_bt_values \
+	lib/test_bt_uuid \
 	lib/test_graph_topo \
 	lib/test_trace_ir_ref
 
+TESTS_BITFIELD = \
+	bitfield/test_bitfield
+
 TESTS_CTF_WRITER = \
 	ctf-writer/test_ctf_writer
 
@@ -68,7 +70,8 @@ TESTS_LIB += lib/test_plugin
 endif
 
 TESTS_PLUGINS = \
-	plugins/src.ctf.fs/succeed/test_succeed
+	plugins/src.ctf.fs/succeed/test_succeed \
+	plugins/sink.ctf.fs/succeed/test_succeed
 
 if !ENABLE_BUILT_IN_PLUGINS
 if ENABLE_PYTHON_BINDINGS
@@ -92,6 +95,12 @@ TESTS_PLUGINS += \
 	plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu
 endif
 
+if ENABLE_PYTHON_PLUGINS
+if ENABLE_PYTHON_BINDINGS
+TESTS_PLUGINS += plugins/flt.utils.trimmer/test_trimming
+endif
+endif
+
 TESTS_PYTHON_PLUGIN_PROVIDER =
 
 if ENABLE_PYTHON_PLUGINS
@@ -106,10 +115,17 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \
 	     BT_TESTS_GREP_BIN="$(GREP)" \
 	     BT_TESTS_PYTHON_BIN="$(PYTHON)" \
 	     BT_TESTS_SED_BIN="$(SED)" \
-	     $(SHELL) $(top_srcdir)/config/tap-driver.sh
+	     $(SHELL) $(srcdir)/utils/tap-driver.sh
 
-TESTS = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_CTF_WRITER) $(TESTS_LIB) \
-	$(TESTS_PLUGINS) $(TESTS_PYTHON_PLUGIN_PROVIDER)
+TESTS_NO_BITFIELD = \
+	$(TESTS_BINDINGS) \
+	$(TESTS_CLI) \
+	$(TESTS_CTF_WRITER) \
+	$(TESTS_LIB) \
+	$(TESTS_PLUGINS) \
+	$(TESTS_PYTHON_PLUGIN_PROVIDER)
+
+TESTS = $(TESTS_NO_BITFIELD) $(TESTS_BITFIELD)
 
 define check_target
 check-$(1):
@@ -117,8 +133,12 @@ check-$(1):
 endef
 
 $(eval $(call check_target,bindings,$(TESTS_BINDINGS)))
+$(eval $(call check_target,bitfield,$(TESTS_BITFIELD)))
 $(eval $(call check_target,cli,$(TESTS_CLI)))
 $(eval $(call check_target,ctf-writer,$(TESTS_CTF_WRITER)))
 $(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)))
+
+check-no-bitfield:
+	$(MAKE) $(AM_MAKEFLAGS) TESTS="$(TESTS_NO_BITFIELD)" check