projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: remove declaration already present in utils.sh
[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..c7508dd777a3be07c7bda928a2705c40927c0172 100644
(file)
--- a/
tests/regression/tools/health/test_health.sh
+++ b/
tests/regression/tools/health/test_health.sh
@@
-15,7
+15,6
@@
# 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"
UST_EVENT_NAME="tp:tptest"
KERNEL_EVENT_NAME="sched_switch"
CHANNEL_NAME="testchan"
@@
-25,10
+24,6
@@
SLEEP_TIME=30
source $TESTDIR/utils/utils.sh
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
+99,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,7
+141,9
@@
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
fi
stop_lttng_sessiond
fi
stop_lttng_sessiond
@@
-161,6
+158,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.046452 seconds
and
4
git commands to generate.