From: Jonathan Rajotte Date: Wed, 27 Jul 2022 18:52:00 +0000 (-0400) Subject: Default to ctf2 for testing X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=89543bdf326b0ecf9d5103666e4c2f1f91037f6f;hp=60a597fe800fefe3ef582c2dc5047b625e0fe481;p=lttng-tools.git Default to ctf2 for testing Signed-off-by: Jonathan Rajotte Change-Id: I3ef155e3034fb6c7516e65f84043737ecfa3e07a --- diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py index 33b7fd28a..c0e38e92b 100644 --- a/tests/utils/test_utils.py +++ b/tests/utils/test_utils.py @@ -80,7 +80,7 @@ def create_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_env = 'ctf2' trace_format_desc = trace_format_mapping[value]() diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 04f76215e..ee83504ec 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -33,7 +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} +TRACE_FORMAT_OUTPUT=${LTTNG_TESTS_TRACE_FORMAT:-ctf2} # 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