From 72b1f06a33730a09636dfa7a1b1cc01d56766856 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Sun, 17 Sep 2017 14:35:58 -0400 Subject: [PATCH] Tests: confusion between python bindings and plugins tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- tests/Makefile.am | 10 +++++++--- tests/bindings/python/babeltrace/Makefile.am | 12 ++---------- tests/bindings/python/babeltrace/test_reader.py | 2 -- 3 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 tests/bindings/python/babeltrace/test_reader.py diff --git a/tests/Makefile.am b/tests/Makefile.am index 796334ff..c5d61bab 100644 --- 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 19900b43..6111cb98 100644 --- 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 index cd6adc32..00000000 --- a/tests/bindings/python/babeltrace/test_reader.py +++ /dev/null @@ -1,2 +0,0 @@ -import babeltrace -import unittest -- 2.34.1