Use LTTNG_TEST_TRACE_FORMAT from env to chose the session trace format

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

diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py
index 385f8544d1130a3487a4cedf959821ddf9d837c2..33b7fd28ada68e1f5a8907e973bbe0efbf6b742b 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,9 +77,20 @@ def create_session():
     tmp_directory = tempfile.mkdtemp()
     trace_path = tmp_directory + "/" + session_name
 
-    res = create(session_name, trace_path)
-    if res < 0:
-        bail("Failed to create tracing session.")
+    if 'LTTNG_TEST_TRACE_FORMAT' in os.environ:
+        trace_format_env = os.getenv('LTTNG_TEST_TRACE_FORMAT')
+    else:
+        trace_format_env = 'ctf1'
+
+    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()
     channel.name = "channel0"