Tests: confusion between python bindings and plugins tests

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 796334ffaa616553a6dd765417fddc17ee1d4f5c..c5d61bab330bf37c4f0cffee0bee1b1470818d74 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,7 +8,11 @@ TESTS_BINDINGS =
 
 if ENABLE_PYTHON_PLUGINS
 SUBDIRS += python-plugin-provider
-TESTS_BINDINGS += bindings/python/bt2/test_python_bt2
+endif
+
+if ENABLE_PYTHON_BINDINGS
+TESTS_BINDINGS += bindings/python/bt2/test_python_bt2 \
+       bindings/python/babeltrace/test_python_babeltrace
 endif
 
 TESTS_CLI = \
@@ -31,7 +35,7 @@ TESTS_LIB = \
        lib/test_cc_prio_map \
        lib/test_bt_notification_iterator
 
-if ENABLE_PYTHON_PLUGINS
+if ENABLE_PYTHON_BINDINGS
 TESTS_LIB += \
        lib/writer/test_ctf_writer_no_packet_context.py \
        lib/writer/test_ctf_writer_empty_packet.py
@@ -55,7 +59,7 @@ endif
 
 TESTS_PYTHON_PLUGIN_PROVIDER =
 
-if ENABLE_PYTHON_BINDINGS
+if ENABLE_PYTHON_PLUGINS
 TESTS_PYTHON_PLUGIN_PROVIDER += python-plugin-provider/test_python_plugin_provider
 endif
 

diff --git a/tests/bindings/python/babeltrace/Makefile.am b/tests/bindings/python/babeltrace/Makefile.am
index 19900b4318577fd339359a3e9322e1ee42e54641..6111cb9887e1b9ea9d3b2d8648880e6985202336 100644 (file)
--- a/tests/bindings/python/babeltrace/Makefile.am
+++ b/tests/bindings/python/babeltrace/Makefile.am
@@ -1,12 +1,4 @@
-EXTRA_DIST =                                                   \
-       test_reader.py                                          \
-       test_reader_event.py                            \
+EXTRA_DIST =                                   \
+       test_reader_event.py                    \
        test_reader_event_declaration.py        \
        test_reader_field_declaration.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_babeltrace
-endif

diff --git a/tests/bindings/python/babeltrace/test_reader.py b/tests/bindings/python/babeltrace/test_reader.py
deleted file mode 100644 (file)
index cd6adc3..0000000
--- a/tests/bindings/python/babeltrace/test_reader.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import babeltrace
-import unittest