projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: add check_skip_kernel_test to check root user and lttng kernel modules
[lttng-tools.git]
/
tests
/
regression
/
tools
/
health
/
test_health.sh
diff --git
a/tests/regression/tools/health/test_health.sh
b/tests/regression/tools/health/test_health.sh
index b4b416f929f7c5924611fda3f62f05ce91173104..23cb05075d33a0edabd2dd4a6060710e3d0dbbca 100644
(file)
--- a/
tests/regression/tools/health/test_health.sh
+++ b/
tests/regression/tools/health/test_health.sh
@@
-82,7
+82,7
@@
function test_health
diag "With UST consumer daemons"
enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
diag "With UST consumer daemons"
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
" ||
+
check_skip_kernel_test "1" "Skipping kernel consumer health check test.
" ||
{
diag "With kernel consumer daemon"
lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME $CHANNEL_NAME
{
diag "With kernel consumer daemon"
lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME $CHANNEL_NAME
@@
-113,7
+113,7
@@
function test_health
if [ ${test_needs_root} -eq 1 ]; then
if [ ${test_needs_root} -eq 1 ]; then
-
skip ${isroot} "Root access needed for test \"${test_thread_name}\"." "1
" ||
+
check_skip_kernel_test "1" "Skipping \"${test_thread_name}\".
" ||
{
report_errors "${test_thread_error_string}" "${test_relayd}"
}
{
report_errors "${test_thread_error_string}" "${test_relayd}"
}
@@
-271,12
+271,6
@@
STDERR_PATH=$(mktemp -t tmp.test_health_stderr_path.XXXXXX)
TRACE_PATH=$(mktemp -d -t tmp.test_health_trace_path.XXXXXX)
HEALTH_PATH=$(mktemp -d -t tmp.test_health_trace_path.XXXXXX)
TRACE_PATH=$(mktemp -d -t tmp.test_health_trace_path.XXXXXX)
HEALTH_PATH=$(mktemp -d -t tmp.test_health_trace_path.XXXXXX)
-if [ "$(id -u)" == "0" ]; then
- isroot=1
-else
- isroot=0
-fi
-
THREAD_COUNT=${#THREAD[@]}
i=0
while [ "$i" -lt "$THREAD_COUNT" ]; do
THREAD_COUNT=${#THREAD[@]}
i=0
while [ "$i" -lt "$THREAD_COUNT" ]; do
This page took
0.024877 seconds
and
4
git commands to generate.