Default to ctf2 for testing

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Change-Id: I3ef155e3034fb6c7516e65f84043737ecfa3e07a

diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py
index 33b7fd28ada68e1f5a8907e973bbe0efbf6b742b..c0e38e92b6a37b8e0e762e2324ae431ebea72281 100644 (file)
--- 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 04f76215e81b5f2be6c5d0ca25b1b14c201cf376..ee83504ec8280aa502f4d1da29d2aeec307dca4c 100644 (file)
--- 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