sessiond: add a CTF 2-generating trace class visitor

[lttng-tools.git] / tests / regression / tools / save-load / test_load

diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index 15901f4f09cf046b0a378316f79e2258a81a3611..f149acd08e6c17bb430a988dd403fe95d6726165 100755 (executable)
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -9,7 +9,7 @@ TEST_DESC="Load session(s)"
 CURDIR=$(dirname $0)/
 CONFIG_DIR="${CURDIR}/configuration"
 TESTDIR=$CURDIR/../../../
-export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/)
+export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/)
 
 SESSION_NAME="load-42"
 EVENT_NAME="tp:tptest"
@@ -19,7 +19,6 @@ DIR=$(readlink -f $TESTDIR)
 NUM_TESTS=75
 
 source $TESTDIR/utils/utils.sh
-XML_EXTRACT="$TESTDIR/utils/xml-utils/extract_xml"
 
 # MUST set TESTDIR before calling those functions
 plan_tests $NUM_TESTS
@@ -59,7 +58,7 @@ function test_complex_load()
        disable_ust_lttng_channel $sess chan3
 
        # Confirm that an event stored as disabled is restored in its disabled state
-       local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+       local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
        if [ $? -ne 0 ]; then
                break;
        fi
@@ -128,26 +127,26 @@ function test_trackers()
        lttng_load_ok "-i $CURDIR/$SESSION_NAME-trackers.lttng"
 
        diag "Test pid tracker"
-       local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+       local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
        if [ $? -ne 0 ]; then
                break;
        fi
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN --mi XML list "$SESSION_NAME-trackers" > $mi_output_file
-       mi_result=$("$XML_EXTRACT" -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:process_attr_trackers/lttng:vpid_process_attr_tracker/lttng:process_attr_values/lttng:vpid")
+       mi_result=$($XML_NODE_CHECK $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:process_attr_trackers/lttng:vpid_process_attr_tracker/lttng:process_attr_values/lttng:vpid")
        if [[ $mi_result = "true" ]]; then
            ok 0 "VPID target is present"
        else
            fail "VPID target missing"
        fi
 
-       mi_result=$("$XML_EXTRACT" -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:process_attr_trackers/lttng:vuid_process_attr_tracker/lttng:process_attr_values/lttng:vuid")
+       mi_result=$($XML_NODE_CHECK $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:process_attr_trackers/lttng:vuid_process_attr_tracker/lttng:process_attr_values/lttng:vuid")
        if [[ $mi_result = "true" ]]; then
            ok 0 "VUID target is present"
        else
            fail "VUID target missing"
        fi
 
-       mi_result=$("$XML_EXTRACT" -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:process_attr_trackers/lttng:vgid_process_attr_tracker/lttng:process_attr_values/lttng:vgid")
+       mi_result=$($XML_NODE_CHECK $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:process_attr_trackers/lttng:vgid_process_attr_tracker/lttng:process_attr_values/lttng:vgid")
        if [[ $mi_result = "true" ]]; then
            ok 0 "VGID target is present"
        else
@@ -177,7 +176,7 @@ function test_override_url_normal()
 
        start_lttng_relayd "-C tcp://127.0.0.1:8172 -D tcp://127.0.0.1:9817"
 
-       local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+       local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
        if [ $? -ne 0 ]; then
                break;
        fi
@@ -227,7 +226,7 @@ function test_override_url_snapshot()
 
        start_lttng_relayd "-C tcp://127.0.0.1:8172 -D tcp://127.0.0.1:9817"
 
-       local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+       local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
        if [ $? -ne 0 ]; then
                break;
        fi
@@ -281,7 +280,7 @@ function test_override_url_live()
 
        start_lttng_relayd "-C tcp://127.0.0.1:8172 -D tcp://127.0.0.1:9817"
 
-       local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+       local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
        if [ $? -ne 0 ]; then
                break;
        fi
@@ -317,7 +316,7 @@ function test_override_session_name()
        local override_name="PinkyAndTheBrain"
        local output_path="/tmp/lttng/load-42-1"
 
-       local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+       local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
        if [ $? -ne 0 ]; then
                break;
        fi
@@ -363,7 +362,7 @@ TESTS=(
 
 for fct_test in ${TESTS[@]};
 do
-       TRACE_PATH=$(mktemp --tmpdir -d tmp.test_load_trace_path.XXXXXX)
+       TRACE_PATH=$(mktemp -d -t tmp.test_load_trace_path.XXXXXX)
 
        ${fct_test}
        if [ $? -ne 0 ]; then