tests: force the trace format to ctf1

[lttng-tools.git] / tests / utils / utils.sh

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 18b673b11452491bc3946abda5aa0225d53be587..a4698c4afabce57da889f986a6c7b7512c8c3c7a 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -1054,9 +1054,10 @@ function create_lttng_session_no_output ()
 {
        local sess_name=$1
        local opts="${@:2}"
+       local trace_format=("--trace-format" "ctf1")
 
        _run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
-               create $sess_name --no-output $opts
+               create "${trace_format[@]}" $sess_name --no-output $opts
        ok $? "Create session $sess_name in no-output mode"
 }
 
@@ -1064,9 +1065,10 @@ function create_lttng_session_uri () {
        local sess_name=$1
        local uri=$2
        local opts="${@:3}"
+       local trace_format=("--trace-format" "ctf1")
 
        _run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
-               create $sess_name -U $uri $opts
+               create "${trace_format[@]}" $sess_name -U $uri $opts
        ok $? "Create session $sess_name with uri:$uri and opts: $opts"
 }
 
@@ -1077,6 +1079,7 @@ function create_lttng_session ()
        local sess_name=$3
        local trace_path=$4
        local opt=$5
+       local trace_format=("--trace-format" "ctf1")
 
        if [ -z "$trace_path" ]; then
                # Use lttng-sessiond default output.
@@ -1086,7 +1089,7 @@ function create_lttng_session ()
        fi
 
        _run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
-               create "$sess_name" $trace_path $opt
+               create "${trace_format[@]}" "$sess_name" $trace_path $opt
        ret=$?
        if [ $expected_to_fail -eq "1" ]; then
                test "$ret" -ne "0"