projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: preserve jul/log4j domain loglevels
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 3e1a81ce5f03e3c7a8aa405b7e2ce29ead2abfb3..4fa31952cb6719a20567ae86152c3350c8377303 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-1514,9
+1514,14
@@
function enable_ust_lttng_event_loglevel()
local sess_name="$1"
local event_name="$2"
local loglevel="$3"
local sess_name="$1"
local event_name="$2"
local loglevel="$3"
+ local channel_name="$4"
+ local chan=()
+ if [ -n "${channel_name}" ] ; then
+ chan=('-c' "${channel_name}")
+ fi
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
- enable-event "$
event_name" -s $sess_name -u --loglevel $loglevel
+ enable-event "$
{chan[@]}" "$event_name" -s "${sess_name}" -u --loglevel="${loglevel}"
ok $? "Enable event $event_name with loglevel $loglevel"
}
ok $? "Enable event $event_name with loglevel $loglevel"
}
@@
-1525,9
+1530,14
@@
function enable_ust_lttng_event_loglevel_only()
local sess_name="$1"
local event_name="$2"
local loglevel="$3"
local sess_name="$1"
local event_name="$2"
local loglevel="$3"
+ local channel_name="$4"
+ local chan=()
+ if [ -n "${channel_name}" ] ; then
+ chan=('-c' "${channel_name}")
+ fi
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
- enable-event "$
event_name" -s $sess_name -u --loglevel-only $loglevel
+ enable-event "$
{chan[@]}" "$event_name" -s "${sess_name}" -u --loglevel-only "${loglevel}"
ok $? "Enable event $event_name with loglevel-only $loglevel"
}
ok $? "Enable event $event_name with loglevel-only $loglevel"
}
This page took
0.024417 seconds
and
4
git commands to generate.