X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2FMakefile.am;h=2f5ed60e88222f276a8817b14445ad794e7f541d;hb=331731aa31dbd587ebd54e32c7f6c136f34aef7e;hp=36e62592d0b8aa4695083348a362c891b3d976bc;hpb=7bb90dd0a5fb8b11ca6e4a7086c66623378fccea;p=babeltrace.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 36e62592..2f5ed60e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = utils lib plugins
+SUBDIRS = utils lib ctf-writer plugins
 
 # Directories added to EXTRA_DIST will be recursively copied to the distribution.
 EXTRA_DIST = $(srcdir)/ctf-traces \
@@ -6,9 +6,6 @@ EXTRA_DIST = $(srcdir)/ctf-traces \
 	     bindings/python/bt2/.coveragerc
 
 dist_check_SCRIPTS = \
-	bindings/python/babeltrace/test_ctf_writer_empty_packet.py \
-	bindings/python/babeltrace/test_ctf_writer_no_packet_context.py \
-	bindings/python/babeltrace/test_ctf_writer.py \
 	bindings/python/bt2/test_clock_class_priority_map.py \
 	bindings/python/bt2/test_clock_class.py \
 	bindings/python/bt2/test_component_class.py \
@@ -38,8 +35,7 @@ dist_check_SCRIPTS = \
 TESTS_BINDINGS =
 
 if ENABLE_PYTHON_BINDINGS
-TESTS_BINDINGS += bindings/python/bt2/test_python_bt2 \
-	bindings/python/babeltrace/test_python_babeltrace
+TESTS_BINDINGS += bindings/python/bt2/test_python_bt2
 endif
 
 TESTS_CLI = \
@@ -53,17 +49,18 @@ TESTS_CLI = \
 TESTS_LIB = \
 	lib/test_bitfield \
 	lib/test_bt_values \
-	lib/test_ctf_writer_complete \
 	lib/test_graph_topo \
 	lib/test_trace_ir_ref
 
+TESTS_CTF_WRITER = \
+	ctf-writer/test_ctf_writer
+
 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
 
 TESTS_PLUGINS =
@@ -99,7 +96,7 @@ 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 = $(TESTS_BINDINGS) $(TESTS_CLI) $(TESTS_CTF_WRITER) $(TESTS_LIB) \
 	$(TESTS_PLUGINS) $(TESTS_PYTHON_PLUGIN_PROVIDER)
 
 define check_target
@@ -109,6 +106,7 @@ endef
 
 $(eval $(call check_target,bindings,$(TESTS_BINDINGS)))
 $(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)))