From 140fc3b49ae11adfac2e6a123d15823913923240 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 27 Jul 2022 14:44:41 -0400 Subject: [PATCH] Use LTTNG_TEST_TRACE_FORMAT from env to chose the session trace format This is a temporary solution for testing. The plan is to review all tests and produce ctf1/ctf2 only when pertinent. For now we want to cover as much ground as possible. Change-Id: Ic5823c15689061f230a6ebd6e0ce3591a2e48ef7 Signed-off-by: Jonathan Rajotte --- tests/regression/tools/live/test_kernel | 2 +- tests/regression/tools/live/test_lttng_kernel | 2 +- tests/utils/test_utils.py | 12 +++++++++++- tests/utils/utils.sh | 7 ++++--- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/regression/tools/live/test_kernel b/tests/regression/tools/live/test_kernel index b01dfda14..8a948d824 100755 --- a/tests/regression/tools/live/test_kernel +++ b/tests/regression/tools/live/test_kernel @@ -25,7 +25,7 @@ source $TESTDIR/utils/utils.sh function setup_live_tracing() { # Create session with default path - $TESTDIR/../src/bin/lttng/$LTTNG_BIN create --trace-format=ctf1 $SESSION_NAME --live $DELAY_USEC \ + $TESTDIR/../src/bin/lttng/$LTTNG_BIN create --trace-format="$TRACE_FORMAT_OUTPUT" $SESSION_NAME --live $DELAY_USEC \ -U net://localhost >/dev/null 2>&1 $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$EVENT_NAME" -s $SESSION_NAME -k >/dev/null 2>&1 diff --git a/tests/regression/tools/live/test_lttng_kernel b/tests/regression/tools/live/test_lttng_kernel index e0e823d66..93d1ebef3 100755 --- a/tests/regression/tools/live/test_lttng_kernel +++ b/tests/regression/tools/live/test_lttng_kernel @@ -30,7 +30,7 @@ print_test_banner "$TEST_DESC" function setup_live_tracing() { # Create session with default path - $TESTDIR/../src/bin/lttng/$LTTNG_BIN create --trace-format=ctf1 $SESSION_NAME --live $DELAY_USEC \ + $TESTDIR/../src/bin/lttng/$LTTNG_BIN create --trace-format="$TRACE_FORMAT_OUTPUT" $SESSION_NAME --live $DELAY_USEC \ -U net://localhost >/dev/null 2>&1 ok $? "Create session in live mode with delay $DELAY_USEC" diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py index 39ff21bfd..33b7fd28a 100644 --- a/tests/utils/test_utils.py +++ b/tests/utils/test_utils.py @@ -23,6 +23,10 @@ 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,7 +76,13 @@ def create_session(): session_name = str(uuid.uuid1()) tmp_directory = tempfile.mkdtemp() trace_path = tmp_directory + "/" + session_name - trace_format_desc = lttng_trace_format_ctf_1_descriptor_create() + + 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) diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index a4698c4af..04f76215e 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -33,6 +33,7 @@ system_long_bit_size=$(getconf LONG_BIT) KERNEL_MAJOR_VERSION=2 KERNEL_MINOR_VERSION=6 KERNEL_PATCHLEVEL_VERSION=27 +TRACE_FORMAT_OUTPUT=${LTTNG_TESTS_TRACE_FORMAT:-ctf1} # We set the default UST register timeout and network and app socket timeout to # "wait forever", so that basic tests don't have to worry about hitting @@ -1054,7 +1055,7 @@ function create_lttng_session_no_output () { local sess_name=$1 local opts="${@:2}" - local trace_format=("--trace-format" "ctf1") + local trace_format=("--trace-format" "$TRACE_FORMAT_OUTPUT") _run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \ create "${trace_format[@]}" $sess_name --no-output $opts @@ -1065,7 +1066,7 @@ function create_lttng_session_uri () { local sess_name=$1 local uri=$2 local opts="${@:3}" - local trace_format=("--trace-format" "ctf1") + local trace_format=("--trace-format" "$TRACE_FORMAT_OUTPUT") _run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \ create "${trace_format[@]}" $sess_name -U $uri $opts @@ -1079,7 +1080,7 @@ function create_lttng_session () local sess_name=$3 local trace_path=$4 local opt=$5 - local trace_format=("--trace-format" "ctf1") + local trace_format=("--trace-format" "$TRACE_FORMAT_OUTPUT") if [ -z "$trace_path" ]; then # Use lttng-sessiond default output. -- 2.34.1