tests: add check_skip_kernel_test to check root user and lttng kernel modules

[lttng-tools.git] / tests / regression / tools / rotation / test_kernel

diff --git a/tests/regression/tools/rotation/test_kernel b/tests/regression/tools/rotation/test_kernel
index 62bc5c33d7fda975b4a6294b4ade05d395e398c9..e66a257a962da00ec612d81e143e133e7bfa9944 100755 (executable)
--- a/tests/regression/tools/rotation/test_kernel
+++ b/tests/regression/tools/rotation/test_kernel
@@ -10,7 +10,7 @@ CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="lttng_test_filter_event"
 
-TRACE_PATH=$(mktemp --tmpdir -d -t tmp.rotation_kernel_tracing.XXXXXX)
+TRACE_PATH=$(mktemp -d -t tmp.rotation_kernel_tracing.XXXXXX)
 
 NUM_TESTS=66
 
@@ -96,7 +96,8 @@ function test_kernel_local_size ()
        lttng_enable_rotation_size_ok $SESSION_NAME $size_threshold
        start_lttng_tracing_ok $SESSION_NAME
 
-       trace_until_n_archives produce_n_events "$TRACE_PATH" 5
+       # Cutoff at 100 times the expected size
+       trace_until_n_archives produce_n_events "$TRACE_PATH" 5 $((5 * 100 * size_threshold))
 
        destroy_lttng_session_ok $SESSION_NAME
 }
@@ -106,13 +107,7 @@ plan_tests $NUM_TESTS
 print_test_banner "$TEST_DESC"
 bail_out_if_no_babeltrace
 
-if [ "$(id -u)" == "0" ]; then
-       isroot=1
-else
-       isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
+check_skip_kernel_test "$NUM_TESTS" "Skipping all tests." ||
 {
        validate_lttng_modules_present