X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_thread_exit;h=4a07aba5cd79f3ea5bf60a8e3166351885f2c40d;hb=d9ab33856fd7bef5b598c9b6a47309b3bf9b06f2;hp=885ad194182736e147046d6d33c52b69ef3741fd;hpb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32;p=lttng-tools.git

diff --git a/tests/regression/tools/health/test_thread_exit b/tests/regression/tools/health/test_thread_exit
index 885ad1941..4a07aba5c 100755
--- a/tests/regression/tools/health/test_thread_exit
+++ b/tests/regression/tools/health/test_thread_exit
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 # Copyright (C) - 2012 Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) - 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License, version 2 only, as
@@ -17,100 +18,19 @@
 
 TEST_DESC="Health check - Thread exit"
 
-CURDIR=$(dirname $0)/
-TESTDIR=$CURDIR/../../..
-LTTNG_BIN="lttng"
 SESSION_NAME="health_thread_exit"
-EVENT_NAME="bogus"
-HEALTH_CHECK_BIN="health_check"
 SESSIOND_PRELOAD=".libs/libhealthexit.so"
-NUM_TESTS=12
-
-source $TESTDIR/utils/utils.sh
-
-print_test_banner "$TEST_DESC"
-
-if [ ! -f "$CURDIR/$SESSIOND_PRELOAD" ]; then
-	BAIL_OUT "libhealthexit.so not available for this test."
-fi
-
-function test_thread_exit
-{
-	test_thread_exit_name="$1"
-	test_thread_exit_code="$2"
-
-	diag "Test health failure with ${test_thread_exit_name}"
-
-	# Activate testpoints
-	export LTTNG_TESTPOINT_ENABLE=1
-
-	# Activate specific thread exit
-	export ${test_thread_exit_name}_EXIT=1
-
-	# Spawn sessiond with preload healthexit lib
-	export LD_PRELOAD="$CURDIR/$SESSIOND_PRELOAD"
-	start_lttng_sessiond
-
-	# Cleanup some env. var.
-	unset LD_PRELOAD
-	unset ${test_thread_exit_name}_EXIT
-
-	# Check initial health status
-	$CURDIR/$HEALTH_CHECK_BIN &> /dev/null
-
-	# Wait
-	sleep 25
-
-	# Check health status, exit code should indicate failure
-	$CURDIR/$HEALTH_CHECK_BIN &> /dev/null
-
-	health_check_exit_code=$?
-
-	if [ $health_check_exit_code -eq $test_thread_exit_code ]; then
-		pass "Validate thread ${test_thread_exit_name} failure"
-		stop_lttng_sessiond
-	else
-		fail "Validate thread ${test_thread_exit_name} failure"
-
-		diag "Health returned: $health_check_exit_code\n"
-
-		stop_lttng_sessiond
-		return 1
-	fi
-}
-plan_tests $NUM_TESTS
-
-THREAD=("LTTNG_THREAD_MANAGE_CLIENTS"
-	"LTTNG_THREAD_MANAGE_APPS"
-	"LTTNG_THREAD_REG_APPS")
-
-# Exit code value to indicate specific thread failure
-EXIT_CODE=(1 2 4)
-
-THREAD_COUNT=${#THREAD[@]}
-i=0
-while [ "$i" -lt "$THREAD_COUNT" ]; do
-	test_thread_exit "${THREAD[$i]}" "${EXIT_CODE[$i]}"
-
-	if [ $? -eq 1 ]; then
-		exit 1
-	fi
-
-	let "i++"
-done
-
-# The manage kernel thread is only spawned if we are root
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-else
-	isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping LTTNG_THREAD_MANAGE_KERNEL tests." "3" ||
-{
-	test_thread_exit "LTTNG_THREAD_MANAGE_KERNEL" "8"
-}
-
-
-# TODO: Special case manage consumer, need to spawn consumer via commands.
-#"LTTNG_THREAD_MANAGE_CONSUMER"
+TEST_SUFFIX="EXIT"
+CURDIR=$(dirname $(readlink -f $0))
+
+# A current design limitation of the lttng-consumerd will cause it to
+# hang on shutdown if the timer management thread exits as the teardown
+# of channels switches off the channel's timers. The timer thread is
+# then expected to purge timer signals and signal when it is done.
+# Obviously this state will never be reached as signals are no longer
+# being processed. This is not dramatic as this is not what this test
+# is meant to test; we only want to make sure the health check signals that
+# something went wrong.
+KILL_SIGNAL="SIGKILL"
+
+source ${CURDIR}/test_health.sh