X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_health.sh;h=27571d05f737ff908f91f44eecde60c5996074aa;hb=5da3fc8579a9f93ea4767729a107784bf2d034ae;hp=6ae8885d040953f0002e93ff215e6d7ae902905c;hpb=a33d2d4ae3b4bd640b5f535b4213e6606e7d0ddd;p=lttng-tools.git diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh index 6ae8885d0..27571d05f 100644 --- a/tests/regression/tools/health/test_health.sh +++ b/tests/regression/tools/health/test_health.sh @@ -15,28 +15,15 @@ # 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" -NUM_TESTS=90 +NUM_TESTS=106 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 - $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" @@ -104,14 +91,14 @@ function test_health 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 } - start_lttng_tracing $SESSION_NAME + start_lttng_tracing_ok $SESSION_NAME fi if [ ${test_relayd} -eq 1 ]; then @@ -146,9 +133,12 @@ function test_health 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 - stop_lttng_sessiond + stop_lttng_consumerd $KILL_SIGNAL + stop_lttng_sessiond $KILL_SIGNAL unset LTTNG_TESTPOINT_ENABLE unset ${test_thread_name}_${test_suffix} @@ -161,6 +151,14 @@ plan_tests $NUM_TESTS 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"