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 e463e4fe34476eb347a370a19c827dce7b68eb98..8a710fe303b10c7aa69950a9e2da6cae85823079 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-12,7
+12,7
@@
CONSUMERD_MATCH=".*lttng-consumerd.*"
RELAYD_BIN="lttng-relayd"
RELAYD_MATCH=".*lttng-relayd.*"
LTTNG_BIN="lttng"
RELAYD_BIN="lttng-relayd"
RELAYD_MATCH=".*lttng-relayd.*"
LTTNG_BIN="lttng"
-BABELTRACE_BIN="babeltrace"
+BABELTRACE_BIN="babeltrace
2
"
OUTPUT_DEST=/dev/null
ERROR_OUTPUT_DEST=/dev/null
MI_XSD_MAJOR_VERSION=4
OUTPUT_DEST=/dev/null
ERROR_OUTPUT_DEST=/dev/null
MI_XSD_MAJOR_VERSION=4
@@
-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 ()
@@
-1841,6
+1857,14
@@
function wait_live_viewer_connect ()
pass "Waiting for live viewers on url: $url"
}
pass "Waiting for live viewers on url: $url"
}
+function bail_out_if_no_babeltrace()
+{
+ which "$BABELTRACE_BIN" >/dev/null
+ if [ $? -ne 0 ]; then
+ LTTNG_BAIL_OUT "\"$BABELTRACE_BIN\" binary not found. Skipping tests"
+ fi
+}
+
function validate_metadata_event ()
{
local event_name=$1
function validate_metadata_event ()
{
local event_name=$1
@@
-1850,8
+1874,7
@@
function validate_metadata_event ()
local metadata_file=$(find $trace_path -name "metadata")
local metadata_path=$(dirname $metadata_file)
local metadata_file=$(find $trace_path -name "metadata")
local metadata_path=$(dirname $metadata_file)
- which $BABELTRACE_BIN >/dev/null
- skip $? -ne 0 "Babeltrace binary not found. Skipping trace matches"
+ bail_out_if_no_babeltrace
local count=$($BABELTRACE_BIN --output-format=ctf-metadata $metadata_path | grep $event_name | wc -l)
local count=$($BABELTRACE_BIN --output-format=ctf-metadata $metadata_path | grep $event_name | wc -l)
@@
-1870,8
+1893,7
@@
function trace_matches ()
local nr_iter=$2
local trace_path=$3
local nr_iter=$2
local trace_path=$3
- which $BABELTRACE_BIN >/dev/null
- skip $? -ne 0 "Babeltrace binary not found. Skipping trace matches"
+ bail_out_if_no_babeltrace
local count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
local count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
@@
-1889,8
+1911,9
@@
function trace_match_only()
local nr_iter=$2
local trace_path=$3
local nr_iter=$2
local trace_path=$3
- which $BABELTRACE_BIN >/dev/null
- skip $? -ne 0 "Babeltrace binary not found. Skipping trace matches"
+ bail_out_if_no_babeltrace
+ #which "$BABELTRACE_BIN" >/dev/null
+ #skip $? -ne 0 "\"$BABELTRACE_BIN\" binary not found. Skipping trace comparison"
local count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
local total=$($BABELTRACE_BIN $trace_path | wc -l)
local count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
local total=$($BABELTRACE_BIN $trace_path | wc -l)
@@
-1908,10
+1931,7
@@
function validate_trace
local event_name=$1
local trace_path=$2
local event_name=$1
local trace_path=$2
- which $BABELTRACE_BIN >/dev/null
- if [ $? -ne 0 ]; then
- skip 0 "Babeltrace binary not found. Skipping trace validation"
- fi
+ bail_out_if_no_babeltrace
OLDIFS=$IFS
IFS=","
OLDIFS=$IFS
IFS=","
@@
-1921,7
+1941,7
@@
function validate_trace
pass "Validate trace for event $i, $traced events"
else
fail "Validate trace for event $i"
pass "Validate trace for event $i, $traced events"
else
fail "Validate trace for event $i"
- diag "Found $traced occurences of $i"
+ diag "Found $traced occur
r
ences of $i"
fi
done
ret=$?
fi
done
ret=$?
@@
-1935,10
+1955,7
@@
function validate_trace_count
local trace_path=$2
local expected_count=$3
local trace_path=$2
local expected_count=$3
- which $BABELTRACE_BIN >/dev/null
- if [ $? -ne 0 ]; then
- skip 0 "Babeltrace binary not found. Skipping trace validation"
- fi
+ bail_out_if_no_babeltrace
cnt=0
OLDIFS=$IFS
cnt=0
OLDIFS=$IFS
@@
-1949,7
+1966,7
@@
function validate_trace_count
pass "Validate trace for event $i, $traced events"
else
fail "Validate trace for event $i"
pass "Validate trace for event $i, $traced events"
else
fail "Validate trace for event $i"
- diag "Found $traced occurences of $i"
+ diag "Found $traced occur
r
ences of $i"
fi
cnt=$(($cnt + $traced))
done
fi
cnt=$(($cnt + $traced))
done
@@
-1965,10
+1982,7
@@
function validate_trace_count_range_incl_min_excl_max
local expected_min=$3
local expected_max=$4
local expected_min=$3
local expected_max=$4
- which $BABELTRACE_BIN >/dev/null
- if [ $? -ne 0 ]; then
- skip 0 "Babeltrace binary not found. Skipping trace validation"
- fi
+ bail_out_if_no_babeltrace
cnt=0
OLDIFS=$IFS
cnt=0
OLDIFS=$IFS
@@
-1979,7
+1993,7
@@
function validate_trace_count_range_incl_min_excl_max
pass "Validate trace for event $i, $traced events"
else
fail "Validate trace for event $i"
pass "Validate trace for event $i, $traced events"
else
fail "Validate trace for event $i"
- diag "Found $traced occurences of $i"
+ diag "Found $traced occur
r
ences of $i"
fi
cnt=$(($cnt + $traced))
done
fi
cnt=$(($cnt + $traced))
done
@@
-1992,11
+2006,6
@@
function trace_first_line
{
local trace_path=$1
{
local trace_path=$1
- which $BABELTRACE_BIN >/dev/null
- if [ $? -ne 0 ]; then
- skip 0 "Babeltrace binary not found. Skipping trace validation"
- fi
-
$BABELTRACE_BIN $trace_path 2>/dev/null | head -n 1
}
$BABELTRACE_BIN $trace_path 2>/dev/null | head -n 1
}
@@
-2005,15
+2014,14
@@
function validate_trace_exp()
local event_exp=$1
local trace_path=$2
local event_exp=$1
local trace_path=$2
- which $BABELTRACE_BIN >/dev/null
- skip $? -ne 0 "Babeltrace binary not found. Skipping trace validation"
+ bail_out_if_no_babeltrace
traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep --extended-regexp ${event_exp} | wc -l)
if [ "$traced" -ne 0 ]; then
pass "Validate trace for expression '${event_exp}', $traced events"
else
fail "Validate trace for expression '${event_exp}'"
traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep --extended-regexp ${event_exp} | wc -l)
if [ "$traced" -ne 0 ]; then
pass "Validate trace for expression '${event_exp}', $traced events"
else
fail "Validate trace for expression '${event_exp}'"
- diag "Found $traced occurences of '${event_exp}'"
+ diag "Found $traced occur
r
ences of '${event_exp}'"
fi
ret=$?
return $ret
fi
ret=$?
return $ret
@@
-2024,8
+2032,7
@@
function validate_trace_only_exp()
local event_exp=$1
local trace_path=$2
local event_exp=$1
local trace_path=$2
- which $BABELTRACE_BIN >/dev/null
- skip $? -ne 0 "Babeltrace binary not found. Skipping trace matches"
+ bail_out_if_no_babeltrace
local count=$($BABELTRACE_BIN $trace_path | grep --extended-regexp ${event_exp} | wc -l)
local total=$($BABELTRACE_BIN $trace_path | wc -l)
local count=$($BABELTRACE_BIN $trace_path | grep --extended-regexp ${event_exp} | wc -l)
local total=$($BABELTRACE_BIN $trace_path | wc -l)
@@
-2044,10
+2051,7
@@
function validate_trace_empty()
{
local trace_path=$1
{
local trace_path=$1
- which $BABELTRACE_BIN >/dev/null
- if [ $? -ne 0 ]; then
- skip 0 "Babeltrace binary not found. Skipping trace validation"
- fi
+ bail_out_if_no_babeltrace
events=$($BABELTRACE_BIN $trace_path 2>/dev/null)
ret=$?
events=$($BABELTRACE_BIN $trace_path 2>/dev/null)
ret=$?
This page took
0.040415 seconds
and
4
git commands to generate.