projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Use `--no-wait` when destroying sessions in relayd-grouping
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 5bab2f372eeccc64ccb774bfd4806fe0dbb37f11..c1d702e823c33120f96b256df93bd35044a73d8e 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-675,8
+675,9
@@
function stop_lttng_relayd_opt()
# Multiply time by 2 to simplify integer arithmetic
# Multiply time by 2 to simplify integer arithmetic
+ # Multiply time by 5 to adjust for sleeping every 0.1s
if [ -n "$timeout_s" ]; then
if [ -n "$timeout_s" ]; then
- dtimeleft_s=$((timeout_s * 2))
+ dtimeleft_s=$((timeout_s * 2
* 5
))
fi
fi
@@
-711,7
+712,7
@@
function stop_lttng_relayd_opt()
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
- sleep 0.
5
+ sleep 0.
1
done
if [ "$withtap" -eq "1" ]; then
if [ "$retval" -eq "0" ]; then
done
if [ "$withtap" -eq "1" ]; then
if [ "$retval" -eq "0" ]; then
@@
-835,8
+836,9
@@
function stop_lttng_sessiond_opt()
fi
# Multiply time by 2 to simplify integer arithmetic
fi
# Multiply time by 2 to simplify integer arithmetic
+ # Multiply time by 5 to adjust for sleeping every 0.1s
if [ -n "$timeout_s" ]; then
if [ -n "$timeout_s" ]; then
- dtimeleft_s=$((timeout_s * 2))
+ dtimeleft_s=$((timeout_s * 2
* 5
))
fi
if [ -n "$TEST_NO_SESSIOND" ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
fi
if [ -n "$TEST_NO_SESSIOND" ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
@@
-881,7
+883,7
@@
function stop_lttng_sessiond_opt()
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
- sleep 0.
5
+ sleep 0.
1
done
out=1
while [ -n "$out" ]; do
done
out=1
while [ -n "$out" ]; do
@@
-893,7
+895,7
@@
function stop_lttng_sessiond_opt()
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
- sleep 0.
5
+ sleep 0.
1
done
if [ "$withtap" -eq "1" ]; then
done
if [ "$withtap" -eq "1" ]; then
@@
-1003,8
+1005,9
@@
function stop_lttng_consumerd_opt()
fi
# Multiply time by 2 to simplify integer arithmetic
fi
# Multiply time by 2 to simplify integer arithmetic
+ # Multiply time by 5 to adjust for sleeping every 0.1s
if [ -n "$timeout_s" ]; then
if [ -n "$timeout_s" ]; then
- dtimeleft_s=$((timeout_s * 2))
+ dtimeleft_s=$((timeout_s * 2
* 5
))
fi
pids="$(lttng_pgrep "$CONSUMERD_MATCH")"
fi
pids="$(lttng_pgrep "$CONSUMERD_MATCH")"
@@
-1049,7
+1052,7
@@
function stop_lttng_consumerd_opt()
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
fi
dtimeleft_s=$((dtimeleft_s - 1))
fi
- sleep 0.
5
+ sleep 0.
1
done
if [ "$withtap" -eq "1" ]; then
if [ "$retval" -eq "0" ]; then
done
if [ "$withtap" -eq "1" ]; then
if [ "$retval" -eq "0" ]; then
@@
-1688,9
+1691,10
@@
function destroy_lttng_session ()
local withtap=$1
local expected_to_fail=$2
local sess_name=$3
local withtap=$1
local expected_to_fail=$2
local sess_name=$3
+ shift 3
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
- destroy $sess_name
+ destroy $sess_name
$@
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
This page took
0.040784 seconds
and
4
git commands to generate.