projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/common: use single Makefile for parallel builds
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index c6d627cef40134efdefd7e3c0c6b916215adf3a4..8a710fe303b10c7aa69950a9e2da6cae85823079 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-682,8
+682,8
@@
function start_lttng_sessiond_opt()
LTTNG_BAIL_OUT "*** Kernel too old for session daemon tests ***"
fi
LTTNG_BAIL_OUT "*** Kernel too old for session daemon tests ***"
fi
- diag "export LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/
config/
"
- : "${LTTNG_SESSION_CONFIG_XSD_PATH="${DIR}/../src/common/
config/
"}"
+ diag "export LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/"
+ : "${LTTNG_SESSION_CONFIG_XSD_PATH="${DIR}/../src/common/"}"
export LTTNG_SESSION_CONFIG_XSD_PATH
if [ -z "$(lttng_pgrep "${SESSIOND_MATCH}")" ]; then
export LTTNG_SESSION_CONFIG_XSD_PATH
if [ -z "$(lttng_pgrep "${SESSIOND_MATCH}")" ]; then
@@
-1028,10
+1028,26
@@
function sigstop_lttng_consumerd_notap()
function list_lttng_with_opts ()
{
function list_lttng_with_opts ()
{
+ local ret
+ local withtap=$1
+ shift
local opts=$1
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
list $opts
local opts=$1
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
list $opts
- ok $? "Lttng-tool list command with option $opts"
+ ret=$?
+ if [ $withtap -eq "1" ]; then
+ ok $ret "Lttng-tool list command with option $opts"
+ fi
+}
+
+function list_lttng_ok ()
+{
+ list_lttng_with_opts 1 "$@"
+}
+
+function list_lttng_notap ()
+{
+ list_lttng_with_opts 0 "$@"
}
function create_lttng_session_no_output ()
}
function create_lttng_session_no_output ()
This page took
0.023101 seconds
and
4
git commands to generate.