X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_health.sh;h=96e21211574c2de43f12165040edcab2ee395e2a;hb=78e024cfd2d0599440801323a5dfd42396c330ca;hp=5010a9136b7ee94ec7cc13e9bf07f68826676b25;hpb=c4926bb5e18ba7916ff2a5d2c70ed6b099643e73;p=lttng-tools.git

diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
index 5010a9136..96e212115 100644
--- 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}/../../..
-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
@@ -111,7 +106,7 @@ function test_health
 			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 +141,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 +159,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"