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 ade4b0e9c5c211e425655366324aae1dc8d3a32e..96e21211574c2de43f12165040edcab2ee395e2a 100644
(file)
--- a/
tests/regression/tools/health/test_health.sh
+++ b/
tests/regression/tools/health/test_health.sh
@@
-15,20
+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
-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
@@
-146,9
+141,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
+159,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.02604 seconds
and
5
git commands to generate.