Default to ctf2 for testing

[deliverable/lttng-tools.git] / tests / utils / test_utils.py

diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py
index afe066d7692610b2bf0b79638ff63c5ec8d883cd..c0e38e92b6a37b8e0e762e2324ae431ebea72281 100644 (file)
--- a/tests/utils/test_utils.py
+++ b/tests/utils/test_utils.py
@@ -22,6 +22,11 @@ sys.path.append(lttng_bindings_path)
 sys.path.append(lttng_bindings_libs_path)
 from lttng import *
 
+BABELTRACE_BIN="babeltrace2"
+trace_format_mapping = {
+        "ctf1" : lttng_trace_format_ctf_1_descriptor_create,
+        "ctf2" : lttng_trace_format_ctf_2_descriptor_create,
+        }
 
 class SessionInfo:
     def __init__(self, handle, session_name, tmp_directory, channel_name):
@@ -72,8 +77,19 @@ def create_session():
     tmp_directory = tempfile.mkdtemp()
     trace_path = tmp_directory + "/" + session_name
 
-    res = create(session_name, trace_path)
-    if res < 0:
+    if 'LTTNG_TEST_TRACE_FORMAT' in os.environ:
+        trace_format_env = os.getenv('LTTNG_TEST_TRACE_FORMAT')
+    else:
+        trace_format_env = 'ctf2'
+
+    trace_format_desc = trace_format_mapping[value]()
+
+    session_descriptor = lttng_session_descriptor_local_create(session_name, trace_path)
+
+    lttng_session_descriptor_set_trace_format_descriptor(session_descriptor, trace_format_desc)
+
+    res = lttng_create_session_ext(session_descriptor)
+    if res != 10:
         bail("Failed to create recording session.")
 
     channel = Channel()