X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_load;h=d201b53af5ec650d300d7412de14e2df99f10c41;hp=005ec4c9c84d6f335589608884d42a21d72babb0;hb=4d513dce5d26cbc477a00b348beb537d01231cd9;hpb=5f73564142abcb8c6263c66b2dbd405db8393e55 diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load index 005ec4c9c..d201b53af 100755 --- a/tests/regression/tools/save-load/test_load +++ b/tests/regression/tools/save-load/test_load @@ -20,9 +20,6 @@ TEST_DESC="Load session(s)" CURDIR=$(dirname $0)/ CONFIG_DIR="${CURDIR}/configuration" TESTDIR=$CURDIR/../../../ -SESSIOND_BIN="lttng-sessiond" -RELAYD_BIN="lttng-relayd" -LTTNG_BIN="lttng" export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/) SESSION_NAME="load-42" @@ -30,7 +27,7 @@ EVENT_NAME="tp:tptest" DIR=$(readlink -f $TESTDIR) -NUM_TESTS=66 +NUM_TESTS=67 source $TESTDIR/utils/utils.sh @@ -306,6 +303,7 @@ function test_override_session_name() { diag "Test session name override" local override_name="PinkyAndTheBrain" + local output_path="/tmp/lttng/load-42-1" local mi_output_file=$(mktemp) if [ $? -ne 0 ]; then @@ -323,6 +321,12 @@ function test_override_session_name() test "${mi_result}" = "${override_name}" ok $? "Override name successful [${SESSION_NAME} to ${override_name}]" + + # Make sure that the name override did not change something else + mi_result=$($CURDIR/../mi/extract_xml $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:path") + test "${mi_result}" = "${output_path}" + ok $? "Output path is not affected by name override" + destroy_lttng_session_ok "${override_name}" diag "Test session name override with all (Do not permit)" @@ -339,10 +343,10 @@ TESTS=( test_all_load test_overwrite test_trackers + test_override_session_name test_override_url_normal test_override_url_snapshot test_override_url_live - test_override_session_name ) for fct_test in ${TESTS[@]};