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: error accounting: unchecked lttng_ht_del return value
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 7e8100f005e8dc35757ab819c1f229e3267b78cc..4ef4c72645b39294fada49b4eaf60c71efc91da4 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-565,6
+565,9
@@
function start_lttng_sessiond_opt()
local withtap=$1
local load_path=$2
local withtap=$1
local load_path=$2
+ # The rest of the arguments will be passed directly to lttng-sessiond.
+ shift 2
+
local env_vars=""
local consumerd=""
local env_vars=""
local consumerd=""
@@
-609,10
+612,10
@@
function start_lttng_sessiond_opt()
# Have a load path ?
if [ -n "$load_path" ]; then
# shellcheck disable=SC2086
# Have a load path ?
if [ -n "$load_path" ]; then
# shellcheck disable=SC2086
- env $env_vars --load "$load_path" --background "$consumerd"
+ env $env_vars --load "$load_path" --background "$consumerd"
"$@"
else
# shellcheck disable=SC2086
else
# shellcheck disable=SC2086
- env $env_vars --background "$consumerd"
+ env $env_vars --background "$consumerd"
"$@"
fi
#$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --verbose-consumer >>/tmp/sessiond.log 2>&1
status=$?
fi
#$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --verbose-consumer >>/tmp/sessiond.log 2>&1
status=$?
@@
-2163,6
+2166,11
@@
function lttng_add_trigger_ok()
lttng_add_trigger 0 "$@"
}
lttng_add_trigger 0 "$@"
}
+function lttng_add_trigger_fail()
+{
+ lttng_add_trigger 1 "$@"
+}
+
function lttng_remove_trigger_ok()
{
lttng_remove_trigger 0 "$@"
function lttng_remove_trigger_ok()
{
lttng_remove_trigger 0 "$@"
This page took
0.026116 seconds
and
4
git commands to generate.