projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Gen-ust-events: use options instead of arguments
[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 bc25caa5794d9c99be4a5f126117befd3b49220b..27571d05f737ff908f91f44eecde60c5996074aa 100644
(file)
--- a/
tests/regression/tools/health/test_health.sh
+++ b/
tests/regression/tools/health/test_health.sh
@@
-15,24
+15,15
@@
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
TESTDIR=${CURDIR}/../../..
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
TESTDIR=${CURDIR}/../../..
-LTTNG_BIN="lttng"
UST_EVENT_NAME="tp:tptest"
KERNEL_EVENT_NAME="sched_switch"
CHANNEL_NAME="testchan"
HEALTH_CHECK_BIN="health_check"
UST_EVENT_NAME="tp:tptest"
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
-function lttng_create_session_uri
-{
- # Create session with default path
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME \
- -U net://localhost >/dev/null 2>&1
- ok $? "Create session with default path"
-}
-
function report_errors
{
test_thread_error_string="$1"
function report_errors
{
test_thread_error_string="$1"
@@
-144,9
+135,10
@@
function test_health
if [ ${test_relayd} -eq 1 ]; then
# We may fail to stop relayd here, and this is OK, since
# it may have been killed volountarily by testpoint.
if [ ${test_relayd} -eq 1 ]; then
# We may fail to stop relayd here, and this is OK, since
# it may have been killed volountarily by testpoint.
- stop_lttng_relayd_notap
+ 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}
This page took
0.025326 seconds
and
5
git commands to generate.