projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: utils: regroup xml utils to utils.sh
[lttng-tools.git]
/
tests
/
regression
/
tools
/
relayd-grouping
/
test_ust
diff --git
a/tests/regression/tools/relayd-grouping/test_ust
b/tests/regression/tools/relayd-grouping/test_ust
index 1b1299b902e7b61c0bccc6651645714ab3ae0aff..579881492123d31dd2f327bfdc3670749544b494 100755
(executable)
--- a/
tests/regression/tools/relayd-grouping/test_ust
+++ b/
tests/regression/tools/relayd-grouping/test_ust
@@
-16,15
+16,9
@@
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
EVENT_NAME="tp:tptest"
CHANNEL_NAME="my_channel"
EVENT_NAME="tp:tptest"
CHANNEL_NAME="my_channel"
-XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd
-
-XML_VALIDATE="$TESTDIR/regression/tools/mi/validate_xml $XSD_PATH"
-XML_EXTRACT="$TESTDIR/regression/tools/mi/extract_xml"
-
XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
-
NUM_TESTS=688
source "$TESTDIR/utils/utils.sh"
NUM_TESTS=688
source "$TESTDIR/utils/utils.sh"
@@
-40,14
+34,15
@@
function get_auto_session_name ()
local lttng_bin=$LTTNG_BIN
LTTNG_BIN="${lttng_bin} --mi xml"
local lttng_bin=$LTTNG_BIN
LTTNG_BIN="${lttng_bin} --mi xml"
- OUTPUT_DEST=$(mktemp)
+ OUTPUT_DEST=$(mktemp
--tmpdir "tmp.${FUNCNAME[0]}_output.XXXXXX"
)
list_lttng_with_opts
list_lttng_with_opts
- $
XML
_VALIDATE "$OUTPUT_DEST"
+ $
MI
_VALIDATE "$OUTPUT_DEST"
ok $? "Valid lttng list XML"
value=$($XML_EXTRACT "$OUTPUT_DEST" ${XPATH_SESSION}/lttng:name/text\(\))
ok $? "Extraction of session name"
ok $? "Valid lttng list XML"
value=$($XML_EXTRACT "$OUTPUT_DEST" ${XPATH_SESSION}/lttng:name/text\(\))
ok $? "Extraction of session name"
+ rm -f $OUTPUT_DEST
OUTPUT_DEST=/dev/null
LTTNG_BIN=$lttng_bin
OUTPUT_DEST=/dev/null
LTTNG_BIN=$lttng_bin
@@
-462,8
+457,8
@@
function test_ust_pid_streaming_snapshot ()
local file_sync_after_first
local file_sync_before_last
local file_sync_after_first
local file_sync_before_last
- file_sync_after_first=$(mktemp -
u
)
- file_sync_before_last=$(mktemp -
u
)
+ file_sync_after_first=$(mktemp -
-tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX"
)
+ file_sync_before_last=$(mktemp -
-tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX"
)
if [ -z "$session_name" ]; then
is_automatic_session=true
if [ -z "$session_name" ]; then
is_automatic_session=true
@@
-676,7
+671,7
@@
for fct_test in "${tests[@]}";
do
for grouping in "${grouping_types[@]}";
do
do
for grouping in "${grouping_types[@]}";
do
- TRACE_PATH=$(mktemp -
d
)
+ TRACE_PATH=$(mktemp -
-tmpdir -d tmp.test_relayd_grouping_ust_trace_path.XXXXXX
)
# Set the relayd in --group-output-by-session mode
start_lttng_relayd "-o $TRACE_PATH $grouping"
start_lttng_sessiond
# Set the relayd in --group-output-by-session mode
start_lttng_relayd "-o $TRACE_PATH $grouping"
start_lttng_sessiond
This page took
0.026304 seconds
and
4
git commands to generate.