Tests: use jq for extracting info from ctf2 traces

[lttng-tools.git] / tests / regression / tools / metadata / test_ust

diff --git a/tests/regression/tools/metadata/test_ust b/tests/regression/tools/metadata/test_ust
index 6b17b02cf6439eed92c09057254a00d01755ae84..5c999851561ca9d01d61770738d78faf66a7461f 100755 (executable)
--- a/tests/regression/tools/metadata/test_ust
+++ b/tests/regression/tools/metadata/test_ust
@@ -32,13 +32,13 @@ fi
 function test_per_uid ()
 {
        local metadata_path
+       local metadata_env
        local value
        local value2
 
        local expected_path="${TRACE_PATH}/lttng-traces"
        local session_name="per-uid"
-       local metadata=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata.XXXXXX)
-       local metadata_env=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata_env.XXXXXX)
+       metadata_env=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata_env.XXXXXX)
 
        diag "Test UST metadata env field in per-uid mode"
        create_lttng_session_ok "$session_name"
@@ -56,10 +56,7 @@ function test_per_uid ()
        metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
        metadata_path=$(dirname "$metadata_path")
 
-       $BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" > "$metadata"
-
-       # Extract "env" scope
-       awk '/env {/,/};/' < "$metadata" > "$metadata_env"
+       extract_env_to_file "$metadata_path" "$metadata_env"
 
        # Construct the expected path from the env metadata and use it to
        # validate that all information make sense. This information is present
@@ -112,7 +109,6 @@ function test_per_uid ()
        ok $? "Extracting hostname from env metadata"
        is "$value" "$(hostname)" "Hostname is valid"
 
-       rm -f "$metadata"
        rm -f "$metadata_env"
 }
 
@@ -125,8 +121,9 @@ function test_per_pid ()
 
        local expected_path="${TRACE_PATH}/lttng-traces"
        local session_name="per-pid"
-       local metadata=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata.XXXXXX)
-       local metadata_env=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata_env.XXXXXX)
+       local metadata_env
+
+       metadata_env=$(mktemp --tmpdir "tmp.test_${FUNCNAME[0]}_metadata_env.XXXXXX")
 
        diag "Test UST metadata env field in per-pid mode"
        create_lttng_session_ok "$session_name"
@@ -147,10 +144,7 @@ function test_per_pid ()
        metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
        metadata_path=$(dirname "$metadata_path")
 
-       $BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" 1> "$metadata"
-
-       # Extract "env" scope
-       awk '/env {/,/};/' < "$metadata" > "$metadata_env"
+       extract_env_to_file "$metadata_path" "$metadata_env"
 
        # Construct the expected path from the env metadata and use it to
        # validate that all information make sense. This information is present
@@ -214,7 +208,6 @@ function test_per_pid ()
        ok $? "Extracting hostname from env metadata"
        is "$value" "$(hostname)" "Hostname is valid"
 
-       rm -f "$metadata"
        rm -f "$metadata_env"
 }