projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the in-tree session.xsd in test_load
[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 a58c29967cc60aa1d22218b8f4076b75f586c475..c746a5c5c96090953fd78e49bd52ea48755eb92d 100755
(executable)
--- a/
tests/regression/tools/save-load/test_load
+++ b/
tests/regression/tools/save-load/test_load
@@
-22,6
+22,7
@@
TESTDIR=$CURDIR/../../../
SESSIOND_BIN="lttng-sessiond"
RELAYD_BIN="lttng-relayd"
LTTNG_BIN="lttng"
SESSIOND_BIN="lttng-sessiond"
RELAYD_BIN="lttng-relayd"
LTTNG_BIN="lttng"
+export LTTNG_SESSION_CONFIG_XSD_PATH=${TESTDIR}../src/common/config/
SESSION_NAME="load-42"
EVENT_NAME="tp:tptest"
SESSION_NAME="load-42"
EVENT_NAME="tp:tptest"
@@
-51,7
+52,7
@@
function test_basic_load()
{
diag "Test basic load"
{
diag "Test basic load"
- lttng_load "-
s $SESSION_NAME -i $CURDIR
"
+ lttng_load "-
i $CURDIR/$SESSION_NAME.lttng
"
destroy_lttng_session $SESSION_NAME
}
destroy_lttng_session $SESSION_NAME
}
@@
-65,7
+66,7
@@
function test_complex_load()
# custom values.
start_lttng_relayd "-C tcp://localhost:8172 -D tcp://localhost:9817"
# custom values.
start_lttng_relayd "-C tcp://localhost:8172 -D tcp://localhost:9817"
- lttng_load "-
s $sess -i $CURDIR
"
+ lttng_load "-
i $CURDIR/$sess.lttng
"
# Once loaded, we are suppose to be able to disable certain events/channels
# thus having a confirmation that it's valid
# Once loaded, we are suppose to be able to disable certain events/channels
# thus having a confirmation that it's valid
@@
-102,10
+103,10
@@
function test_overwrite()
{
diag "Test load overwrite"
{
diag "Test load overwrite"
- lttng_load "-
s $SESSION_NAME -i $CURDIR
"
+ lttng_load "-
i $CURDIR/$SESSION_NAME.lttng
"
# This one should succeed
# This one should succeed
- lttng_load "-f -
s $SESSION_NAME -i $CURDIR
"
+ lttng_load "-f -
i $CURDIR $SESSION_NAME
"
destroy_lttng_session $SESSION_NAME
}
destroy_lttng_session $SESSION_NAME
}
This page took
0.024414 seconds
and
4
git commands to generate.