X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_thread_exit;h=f4c84d4833d62c727d951df2f5e4cf97f9e536f5;hp=7622e356dd5d1fb190b3eec89cdd2a3cef62223b;hb=a33d2d4ae3b4bd640b5f535b4213e6606e7d0ddd;hpb=1fb2388876f2db46d5c253b9c00cda0990a5f762

diff --git a/tests/regression/tools/health/test_thread_exit b/tests/regression/tools/health/test_thread_exit
index 7622e356d..f4c84d483 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,120 +18,9 @@
 
 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
+TEST_SUFFIX="EXIT"
+CURDIR=$(dirname $(readlink -f $0))
 
-source $TESTDIR/utils/utils.sh
-
-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_error_string="$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"
-	# Set the socket timeout to 5 so the health check delta is set to 25.
-	export LTTNG_NETWORK_SOCKET_TIMEOUT=5
-	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 30
-
-	# Check health status
-	$CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
-
-	out=$(grep "${test_thread_error_string}" ${STDOUT_PATH} | wc -l)
-	if [ $out -eq 0 ]; then
-		fail "Validate thread ${test_thread_exit_name} failure"
-		diag "Health returned:"
-		diag "stdout:"
-		file=${STDOUT_PATH}
-		while read line ; do
-		    diag "$line"
-		done < ${file}
-
-		diag "stderr:"
-		file=${STDERR_PATH}
-		while read line ; do
-		    diag "$line"
-		done < ${file}
-
-		stop_lttng_sessiond
-		return 1
-	else
-		pass "Validate thread ${test_thread_exit_name} failure"
-		stop_lttng_sessiond
-	fi
-}
-
-plan_tests $NUM_TESTS
-
-print_test_banner "$TEST_DESC"
-
-THREAD=("LTTNG_SESSIOND_THREAD_MANAGE_CLIENTS"
-	"LTTNG_SESSIOND_THREAD_MANAGE_APPS"
-	"LTTNG_SESSIOND_THREAD_REG_APPS")
-
-ERROR_STRING=(
-	"Thread \"Session daemon command\" is not responding in component \"sessiond\"."
-	"Thread \"Session daemon application manager\" is not responding in component \"sessiond\"."
-	"Thread \"Session daemon application registration\" is not responding in component \"sessiond\"."
-)
-
-STDOUT_PATH=$(mktemp)
-STDERR_PATH=$(mktemp)
-
-THREAD_COUNT=${#THREAD[@]}
-i=0
-while [ "$i" -lt "$THREAD_COUNT" ]; do
-	test_thread_exit "${THREAD[$i]}" "${ERROR_STRING[$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_SESSIOND_THREAD_MANAGE_KERNEL tests." "3" ||
-{
-	test_thread_exit "LTTNG_SESSIOND_THREAD_MANAGE_KERNEL" "Thread \"Session daemon kernel\" is not responding in component \"sessiond\"."
-}
-
-rm -f ${STDOUT_PATH}
-rm -f ${STDERR_PATH}
-
-# TODO: Special case manage consumer, need to spawn consumer via commands.
-#"LTTNG_SESSIOND_THREAD_MANAGE_CONSUMER"
+source ${CURDIR}/test_health.sh