From 33c820d6c1f3b742a0028e0219b21e364baade78 Mon Sep 17 00:00:00 2001 From: Christian Babeux Date: Thu, 21 Feb 2013 23:17:34 -0500 Subject: [PATCH] Tests: Convert the tools health tests output to TAP Signed-off-by: Christian Babeux --- .../regression/tools/health/test_thread_exit | 37 +++++++++++------ .../regression/tools/health/test_thread_stall | 41 +++++++++++-------- tests/regression/tools/health/test_tp_fail | 38 ++++++++++------- 3 files changed, 73 insertions(+), 43 deletions(-) diff --git a/tests/regression/tools/health/test_thread_exit b/tests/regression/tools/health/test_thread_exit index 79e0e051d..885ad1941 100755 --- a/tests/regression/tools/health/test_thread_exit +++ b/tests/regression/tools/health/test_thread_exit @@ -24,14 +24,14 @@ 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 - echo -e "libhealthexit.so not available for this test. Skipping." - exit 0 + BAIL_OUT "libhealthexit.so not available for this test." fi function test_thread_exit @@ -39,8 +39,7 @@ function test_thread_exit test_thread_exit_name="$1" test_thread_exit_code="$2" - echo "" - echo -e "=== Testing health failure with ${test_thread_exit_name}" + diag "Test health failure with ${test_thread_exit_name}" # Activate testpoints export LTTNG_TESTPOINT_ENABLE=1 @@ -59,8 +58,6 @@ function test_thread_exit # Check initial health status $CURDIR/$HEALTH_CHECK_BIN &> /dev/null - echo -n "Validating thread ${test_thread_exit_name} failure... " - # Wait sleep 25 @@ -70,24 +67,25 @@ function test_thread_exit health_check_exit_code=$? if [ $health_check_exit_code -eq $test_thread_exit_code ]; then - print_ok + pass "Validate thread ${test_thread_exit_name} failure" stop_lttng_sessiond else - print_fail - echo -e "Health returned: $health_check_exit_code\n" + 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" - "LTTNG_THREAD_MANAGE_KERNEL") + "LTTNG_THREAD_REG_APPS") # Exit code value to indicate specific thread failure -EXIT_CODE=(1 2 4 8) +EXIT_CODE=(1 2 4) THREAD_COUNT=${#THREAD[@]} i=0 @@ -101,5 +99,18 @@ while [ "$i" -lt "$THREAD_COUNT" ]; do let "i++" done -# Special case manage consumer, need to spawn consumer via commands. +# 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" diff --git a/tests/regression/tools/health/test_thread_stall b/tests/regression/tools/health/test_thread_stall index dc9d850f4..92cfb0135 100755 --- a/tests/regression/tools/health/test_thread_stall +++ b/tests/regression/tools/health/test_thread_stall @@ -24,14 +24,14 @@ SESSION_NAME="health_thread_stall" EVENT_NAME="bogus" HEALTH_CHECK_BIN="health_check" SESSIOND_PRELOAD=".libs/libhealthstall.so" +NUM_TESTS=12 source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" if [ ! -f "$CURDIR/$SESSIOND_PRELOAD" ]; then - echo -e "libhealthstall.so not available for this test. Skipping." - exit 0 + BAIL_OUT "libhealthstall.so not available for this test." fi function test_thread_stall @@ -39,8 +39,7 @@ function test_thread_stall test_thread_stall_name="$1" test_thread_exit_code="$2" - echo "" - echo -e "=== Testing health failure with ${test_thread_stall_name}" + diag "Test health failure with ${test_thread_stall_name}" # Activate testpoints export LTTNG_TESTPOINT_ENABLE=1 @@ -59,8 +58,6 @@ function test_thread_stall # Check initial health status $CURDIR/$HEALTH_CHECK_BIN &> /dev/null - echo -n "Validating that ${test_thread_stall_name} is stalled... " - # Wait sleep 25 @@ -70,17 +67,15 @@ function test_thread_stall health_check_exit_code=$? if [ $health_check_exit_code -eq $test_thread_exit_code ]; then - print_ok + pass "Validate that ${test_thread_stall_name} is stalled" else - print_fail - echo -e "Health returned: $health_check_exit_code\n" + fail "Validate that ${test_thread_stall_name} is stalled" + diag "Health returned: $health_check_exit_code" stop_lttng_sessiond return 1 fi - echo -n "Validating that ${test_thread_stall_name} is no longer stalled... " - # Wait sleep 40 @@ -90,11 +85,11 @@ function test_thread_stall health_check_exit_code=$? if [ $health_check_exit_code -eq 0 ]; then - print_ok + pass "Validate that ${test_thread_stall_name} is no longer stalled" stop_lttng_sessiond else - print_fail - echo -e "Health returned: $health_check_exit_code\n" + fail "Validate that ${test_thread_stall_name} is no longer stalled" + diag "Health returned: $health_check_exit_code\n" stop_lttng_sessiond return 1 fi @@ -102,18 +97,20 @@ function test_thread_stall } +plan_tests $NUM_TESTS + THREAD=("LTTNG_THREAD_MANAGE_CLIENTS" "LTTNG_THREAD_MANAGE_APPS" # This thread is a little bit tricky to stall, # need to send some commands and setup an app. # "LTTNG_THREAD_REG_APPS" - "LTTNG_THREAD_MANAGE_KERNEL") +) # Exit code value to indicate specific thread failure EXIT_CODE=(1 2 # 4 - 8) +) THREAD_COUNT=${#THREAD[@]} i=0 @@ -126,3 +123,15 @@ while [ "$i" -lt "$THREAD_COUNT" ]; do 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_stall "LTTNG_THREAD_MANAGE_KERNEL" "8" +} diff --git a/tests/regression/tools/health/test_tp_fail b/tests/regression/tools/health/test_tp_fail index 0b474fa78..fdb8745a2 100755 --- a/tests/regression/tools/health/test_tp_fail +++ b/tests/regression/tools/health/test_tp_fail @@ -24,14 +24,14 @@ SESSION_NAME="health_tp_fail" EVENT_NAME="bogus" HEALTH_CHECK_BIN="health_check" SESSIOND_PRELOAD=".libs/libhealthtpfail.so" +NUM_TESTS=9 source $TESTDIR/utils/utils.sh print_test_banner "$TEST_DESC" if [ ! -f "$CURDIR/$SESSIOND_PRELOAD" ]; then - echo -e "libhealthtpfail.so not available for this test. Skipping." - exit 0 + BAIL_OUT "libhealthtpfail.so not available for this test." fi function test_tp_fail @@ -39,8 +39,7 @@ function test_tp_fail test_tp_fail_name="$1" test_tp_fail_code="$2" - echo "" - echo -e "=== Testing health failure with ${test_tp_fail_name}" + diag "Test health failure with ${test_tp_fail_name}" # Activate testpoints export LTTNG_TESTPOINT_ENABLE=1 @@ -56,31 +55,29 @@ function test_tp_fail unset LD_PRELOAD unset ${test_tp_fail_name}_TP_FAIL - echo -n "Validating thread ${test_tp_fail_name} failure... " - # 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_tp_fail_code ]; then - print_ok + pass "Validate thread ${test_tp_fail_name} failure" stop_lttng_sessiond else - print_fail - echo -e "Health returned: $health_check_exit_code\n" - + fail "Validate thread ${test_tp_fail_name} failure" + diag "Health returned: $health_check_exit_code" stop_lttng_sessiond return 1 fi } +plan_tests $NUM_TESTS + THREAD=("LTTNG_THREAD_MANAGE_CLIENTS" - "LTTNG_THREAD_MANAGE_APPS" - "LTTNG_THREAD_MANAGE_KERNEL") + "LTTNG_THREAD_MANAGE_APPS") # Exit code value to indicate specific thread failure -EXIT_CODE=(1 2 8) +EXIT_CODE=(1 2) THREAD_COUNT=${#THREAD[@]} i=0 @@ -94,5 +91,18 @@ while [ "$i" -lt "$THREAD_COUNT" ]; do let "i++" done -# Special case manage consumer, need to spawn consumer via commands. +# 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_tp_fail "LTTNG_THREAD_MANAGE_KERNEL" "8" +} + + +# TODO: Special case manage consumer, need to spawn consumer via commands. #"LTTNG_THREAD_MANAGE_CONSUMER" -- 2.34.1