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 SIGKILL to shutdown daemons in test_thread_exit and test_tp_fail
[lttng-tools.git]
/
tests
/
regression
/
tools
/
health
/
test_health.sh
diff --git
a/tests/regression/tools/health/test_health.sh
b/tests/regression/tools/health/test_health.sh
index 6ae8885d040953f0002e93ff215e6d7ae902905c..39f5b874e50e5d756e958491d7f93fef3fec6da2 100644
(file)
--- a/
tests/regression/tools/health/test_health.sh
+++ b/
tests/regression/tools/health/test_health.sh
@@
-20,15
+20,11
@@
UST_EVENT_NAME="tp:tptest"
KERNEL_EVENT_NAME="sched_switch"
CHANNEL_NAME="testchan"
HEALTH_CHECK_BIN="health_check"
KERNEL_EVENT_NAME="sched_switch"
CHANNEL_NAME="testchan"
HEALTH_CHECK_BIN="health_check"
-NUM_TESTS=
90
+NUM_TESTS=
106
SLEEP_TIME=30
source $TESTDIR/utils/utils.sh
SLEEP_TIME=30
source $TESTDIR/utils/utils.sh
-if [ ! -f "$CURDIR/$SESSIOND_PRELOAD" ]; then
- BAIL_OUT "${CURDIR}/${SESSIOND_PRELOAD} is missing."
-fi
-
function lttng_create_session_uri
{
# Create session with default path
function lttng_create_session_uri
{
# Create session with default path
@@
-104,14
+100,14
@@
function test_health
create_lttng_session_no_output $SESSION_NAME
diag "With UST consumer daemons"
create_lttng_session_no_output $SESSION_NAME
diag "With UST consumer daemons"
- enable_ust_lttng_event $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
+ enable_ust_lttng_event
_ok
$SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
skip $isroot "Root access is needed. Skipping kernel consumer health check test." "1" ||
{
diag "With kernel consumer daemon"
lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME $CHANNEL_NAME
}
skip $isroot "Root access is needed. Skipping kernel consumer health check test." "1" ||
{
diag "With kernel consumer daemon"
lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME $CHANNEL_NAME
}
- start_lttng_tracing $SESSION_NAME
+ start_lttng_tracing
_ok
$SESSION_NAME
fi
if [ ${test_relayd} -eq 1 ]; then
fi
if [ ${test_relayd} -eq 1 ]; then
@@
-146,9
+142,12
@@
function test_health
fi
if [ ${test_relayd} -eq 1 ]; then
fi
if [ ${test_relayd} -eq 1 ]; then
- stop_lttng_relayd_nocheck
+ # We may fail to stop relayd here, and this is OK, since
+ # it may have been killed volountarily by testpoint.
+ stop_lttng_relayd_notap $KILL_SIGNAL
fi
fi
- stop_lttng_sessiond
+ stop_lttng_consumerd $KILL_SIGNAL
+ stop_lttng_sessiond $KILL_SIGNAL
unset LTTNG_TESTPOINT_ENABLE
unset ${test_thread_name}_${test_suffix}
unset LTTNG_TESTPOINT_ENABLE
unset ${test_thread_name}_${test_suffix}
@@
-161,6
+160,14
@@
plan_tests $NUM_TESTS
print_test_banner "$TEST_DESC"
print_test_banner "$TEST_DESC"
+if [ -f "$CURDIR/$SESSIOND_PRELOAD" ]; then
+ foundobj=1
+else
+ foundobj=0
+fi
+
+skip $foundobj "No shared object generated. Skipping all tests." $NUM_TESTS && exit 0
+
THREAD=("LTTNG_SESSIOND_THREAD_MANAGE_CLIENTS"
"LTTNG_SESSIOND_THREAD_MANAGE_APPS"
"LTTNG_SESSIOND_THREAD_REG_APPS"
THREAD=("LTTNG_SESSIOND_THREAD_MANAGE_CLIENTS"
"LTTNG_SESSIOND_THREAD_MANAGE_APPS"
"LTTNG_SESSIOND_THREAD_REG_APPS"
This page took
0.027548 seconds
and
5
git commands to generate.