From: Xiangyu Chen <xiangyu.c...@windriver.com>
The current tests will run both userspace and kernel testing.
Some of use cases only use lttng for one kind of tracing on
an embedded device (e.g. userspace), so in this scenario,
the kernel modules might not install to target rootfs, the
test cases would be fail and exit.
Add LTTNG_TOOLS_DISABLE_KERNEL_TESTS to skip the lttng kernel
features test, this flag can be set via "make":
make check LTTNG_TOOLS_DISABLE_KERNEL_TESTS=1
When this flag was set, all kernel related testcases would be marked
as SKIP in result.
Change-Id: I6618161c7b07f759aed7d205a716943346e7536c
Signed-off-by: Xiangyu Chen <xiangyu.c...@windriver.com>
---
tests/destructive/metadata-regeneration | 3 ++
tests/perf/test_perf_raw.in | 3 ++
tests/regression/kernel/test_all_events | 3 ++
tests/regression/kernel/test_callstack | 3 ++
tests/regression/kernel/test_channel | 3 ++
tests/regression/kernel/test_clock_override | 3 ++
tests/regression/kernel/test_event_basic | 3 ++
tests/regression/kernel/test_kernel_function | 3 ++
tests/regression/kernel/test_lttng_logger | 3 ++
tests/regression/kernel/test_ns_contexts | 3 ++
.../regression/kernel/test_ns_contexts_change | 3 ++
.../kernel/test_rotation_destroy_flush | 3 ++
.../regression/kernel/test_select_poll_epoll | 3 ++
tests/regression/kernel/test_syscall | 3 ++
tests/regression/kernel/test_userspace_probe | 3 ++
tests/regression/tools/clear/test_kernel | 3 ++
.../tools/filtering/test_valid_filter | 3 ++
tests/regression/tools/health/test_thread_ok | 2 +
tests/regression/tools/live/test_kernel | 8 ++++
tests/regression/tools/live/test_lttng_kernel | 3 ++
tests/regression/tools/metadata/test_kernel | 3 ++
.../test_notification_kernel_buffer_usage | 37 ++++++++--------
.../test_notification_kernel_capture | 30 +++++++------
.../test_notification_kernel_error | 29 +++++++------
.../test_notification_kernel_instrumentation | 29 +++++++------
.../notification/test_notification_multi_app | 24 +++++++----
...test_notification_notifier_discarded_count | 42 +++++++++++--------
.../tools/regen-metadata/test_kernel | 3 ++
.../tools/regen-statedump/test_kernel | 3 ++
tests/regression/tools/rotation/test_kernel | 3 ++
tests/regression/tools/snapshots/test_kernel | 3 ++
.../tools/tracker/test_event_tracker | 3 ++
.../tools/trigger/test_add_trigger_cli | 6 +++
.../tools/trigger/test_list_triggers_cli | 6 +++
.../tools/wildcard/test_event_wildcard | 3 ++
tests/utils/utils.sh | 11 +++++
36 files changed, 220 insertions(+), 79 deletions(-)
diff --git a/tests/destructive/metadata-regeneration
b/tests/destructive/metadata-regeneration
index 048c601b6..6b5e58a4f 100755
--- a/tests/destructive/metadata-regeneration
+++ b/tests/destructive/metadata-regeneration
@@ -202,6 +202,9 @@ if ! destructive_tests_enabled ; then
exit 0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
original_date=$(date)
diff --git a/tests/perf/test_perf_raw.in b/tests/perf/test_perf_raw.in
index 0a451ce63..cf0a15a6a 100644
--- a/tests/perf/test_perf_raw.in
+++ b/tests/perf/test_perf_raw.in
@@ -154,6 +154,9 @@ have_libpfm
test_ust_raw
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests." 9 ||
skip $isroot "Root access is needed for kernel testing, skipping." 9 ||
{
modprobe lttng-test
diff --git a/tests/regression/kernel/test_all_events
b/tests/regression/kernel/test_all_events
index 2fb2f611d..1c2e6fa0a 100755
--- a/tests/regression/kernel/test_all_events
+++ b/tests/regression/kernel/test_all_events
@@ -49,6 +49,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/kernel/test_callstack
b/tests/regression/kernel/test_callstack
index cf39089af..1e17acc45 100755
--- a/tests/regression/kernel/test_callstack
+++ b/tests/regression/kernel/test_callstack
@@ -142,6 +142,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." "$NUM_TESTS" ||
{
validate_lttng_modules_present
diff --git a/tests/regression/kernel/test_channel
b/tests/regression/kernel/test_channel
index 5525564d2..7589bcaed 100755
--- a/tests/regression/kernel/test_channel
+++ b/tests/regression/kernel/test_channel
@@ -53,6 +53,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
start_lttng_sessiond
diff --git a/tests/regression/kernel/test_clock_override
b/tests/regression/kernel/test_clock_override
index 524c3c3bb..4e7ee38d7 100755
--- a/tests/regression/kernel/test_clock_override
+++ b/tests/regression/kernel/test_clock_override
@@ -180,6 +180,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/kernel/test_event_basic
b/tests/regression/kernel/test_event_basic
index 9f22d7db8..d1246fdc1 100755
--- a/tests/regression/kernel/test_event_basic
+++ b/tests/regression/kernel/test_event_basic
@@ -79,6 +79,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/kernel/test_kernel_function
b/tests/regression/kernel/test_kernel_function
index 131c1c70b..eb8f278fc 100755
--- a/tests/regression/kernel/test_kernel_function
+++ b/tests/regression/kernel/test_kernel_function
@@ -49,6 +49,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
start_lttng_sessiond_notap
diff --git a/tests/regression/kernel/test_lttng_logger
b/tests/regression/kernel/test_lttng_logger
index 849428807..59936761d 100755
--- a/tests/regression/kernel/test_lttng_logger
+++ b/tests/regression/kernel/test_lttng_logger
@@ -116,6 +116,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/kernel/test_ns_contexts
b/tests/regression/kernel/test_ns_contexts
index 98b673c98..4b0986dc7 100755
--- a/tests/regression/kernel/test_ns_contexts
+++ b/tests/regression/kernel/test_ns_contexts
@@ -113,6 +113,9 @@ if [ "$(id -u)" == "0" ]; then
isroot=1
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." "$NUM_TESTS" && exit 0
diff --git a/tests/regression/kernel/test_ns_contexts_change
b/tests/regression/kernel/test_ns_contexts_change
index 715c67cc8..90ce78750 100755
--- a/tests/regression/kernel/test_ns_contexts_change
+++ b/tests/regression/kernel/test_ns_contexts_change
@@ -168,6 +168,9 @@ if [ "$(id -u)" == "0" ]; then
isroot=1
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." "$NUM_TESTS" && exit 0
diff --git a/tests/regression/kernel/test_rotation_destroy_flush
b/tests/regression/kernel/test_rotation_destroy_flush
index 6e568afda..e4ebc8b49 100755
--- a/tests/regression/kernel/test_rotation_destroy_flush
+++ b/tests/regression/kernel/test_rotation_destroy_flush
@@ -126,6 +126,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/kernel/test_select_poll_epoll
b/tests/regression/kernel/test_select_poll_epoll
index cdde1ea4f..c9c4a4975 100755
--- a/tests/regression/kernel/test_select_poll_epoll
+++ b/tests/regression/kernel/test_select_poll_epoll
@@ -371,6 +371,9 @@ fi
diag "Supported syscalls are $SUPPORTED_SYSCALLS_LIST"
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/kernel/test_syscall
b/tests/regression/kernel/test_syscall
index f9b490858..054cd428c 100755
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -670,6 +670,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/kernel/test_userspace_probe
b/tests/regression/kernel/test_userspace_probe
index bfa260e47..e505266d1 100755
--- a/tests/regression/kernel/test_userspace_probe
+++ b/tests/regression/kernel/test_userspace_probe
@@ -821,6 +821,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/tools/clear/test_kernel
b/tests/regression/tools/clear/test_kernel
index ce76f85d2..6611701f5 100755
--- a/tests/regression/tools/clear/test_kernel
+++ b/tests/regression/tools/clear/test_kernel
@@ -565,6 +565,9 @@ snapshot_tests=(test_kernel_streaming_snapshot
test_kernel_local_snapshot
)
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all kernel streaming tests."
$NUM_TESTS ||
{
trap signal_cleanup SIGTERM SIGINT
diff --git a/tests/regression/tools/filtering/test_valid_filter
b/tests/regression/tools/filtering/test_valid_filter
index cd5b1a3b9..ebab40372 100755
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -1460,6 +1460,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_KERNEL_TESTS ||
skip $isroot "Root access is needed. Skipping all kernel valid filter tests."
$NUM_KERNEL_TESTS ||
{
diag "Test kernel valid filters"
diff --git a/tests/regression/tools/health/test_thread_ok
b/tests/regression/tools/health/test_thread_ok
index 663b7e4cb..26a13b2cc 100755
--- a/tests/regression/tools/health/test_thread_ok
+++ b/tests/regression/tools/health/test_thread_ok
@@ -122,6 +122,8 @@ else
isroot=0
fi
+check_skip_kernel_test
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
test_thread_ok
rm -rf ${HEALTH_PATH}
diff --git a/tests/regression/tools/live/test_kernel
b/tests/regression/tools/live/test_kernel
index 1be703aac..6fda45f2c 100755
--- a/tests/regression/tools/live/test_kernel
+++ b/tests/regression/tools/live/test_kernel
@@ -47,6 +47,14 @@ else
exit 0
fi
+check_skip_kernel_test
+
+if [ $? == 0 ]; then
+ plan_skip_all "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests."
+ exit 0
+fi
+
+
modprobe lttng-test
start_lttng_sessiond_notap
diff --git a/tests/regression/tools/live/test_lttng_kernel
b/tests/regression/tools/live/test_lttng_kernel
index ae8c57e6b..513a632be 100755
--- a/tests/regression/tools/live/test_lttng_kernel
+++ b/tests/regression/tools/live/test_lttng_kernel
@@ -51,6 +51,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
{
modprobe lttng-test
diff --git a/tests/regression/tools/metadata/test_kernel
b/tests/regression/tools/metadata/test_kernel
index 9e1e81232..88b98d6a5 100755
--- a/tests/regression/tools/metadata/test_kernel
+++ b/tests/regression/tools/metadata/test_kernel
@@ -104,6 +104,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all kernel metadata tests."
$NUM_TESTS ||
{
validate_lttng_modules_present
diff --git
a/tests/regression/tools/notification/test_notification_kernel_buffer_usage
b/tests/regression/tools/notification/test_notification_kernel_buffer_usage
index 5a87583dc..2f38e7422 100755
--- a/tests/regression/tools/notification/test_notification_kernel_buffer_usage
+++ b/tests/regression/tools/notification/test_notification_kernel_buffer_usage
@@ -63,29 +63,32 @@ function test_buffer_usage_notification
wait $APP_PID 2> /dev/null
}
-if [ "$(id -u)" == "0" ]; then
+if [ "$(id -u)" != "0" ]; then
+ plan_skip_all "Root access is needed. Skipping all tests."
+ exit 0
+fi
- validate_lttng_modules_present
+check_skip_kernel_test
+if [ $? == 0 ]; then
+ plan_skip_all "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests."
+ exit 0
+fi
- modprobe lttng-test
+validate_lttng_modules_present
- # Used on sessiond launch.
- LTTNG_SESSIOND_ENV_VARS="LTTNG_TESTPOINT_ENABLE=1 \
- CONSUMER_PAUSE_PIPE_PATH=${TESTPOINT_PIPE_PATH} \
- LD_PRELOAD=${TESTPOINT}"
- start_lttng_sessiond_notap
+modprobe lttng-test
- test_buffer_usage_notification
+# Used on sessiond launch.
+LTTNG_SESSIOND_ENV_VARS="LTTNG_TESTPOINT_ENABLE=1 \
+ CONSUMER_PAUSE_PIPE_PATH=${TESTPOINT_PIPE_PATH} \
+ LD_PRELOAD=${TESTPOINT}"
+start_lttng_sessiond_notap
- stop_lttng_sessiond_notap
- rmmod lttng-test
+test_buffer_usage_notification
- rm -rf "${consumerd_pipe[@]}" 2> /dev/null
-else
- # Kernel tests are skipped.
- plan_tests $NUM_TESTS
- skip 0 "Root access is needed. Skipping all kernel notification tests."
$NUM_TESTS
-fi
+stop_lttng_sessiond_notap
+rmmod lttng-test
+rm -rf "${consumerd_pipe[@]}" 2> /dev/null
rm -rf "$TEST_TMPDIR"
diff --git
a/tests/regression/tools/notification/test_notification_kernel_capture
b/tests/regression/tools/notification/test_notification_kernel_capture
index 88a3691eb..34cb4d3d5 100755
--- a/tests/regression/tools/notification/test_notification_kernel_capture
+++ b/tests/regression/tools/notification/test_notification_kernel_capture
@@ -31,22 +31,28 @@ function test_basic_error_path
}
-if [ "$(id -u)" == "0" ]; then
- validate_lttng_modules_present
+if [ "$(id -u)" != "0" ]; then
+ plan_skip_all "Root access is needed. Skipping all tests."
+ exit 0
+fi
- modprobe lttng-test
+check_skip_kernel_test
- start_lttng_sessiond_notap
+if [ $? == 0 ]; then
+ plan_skip_all "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests."
+ exit 0
+fi
- test_basic_error_path
+validate_lttng_modules_present
- stop_lttng_sessiond_notap
- rmmod lttng-test
+modprobe lttng-test
+
+start_lttng_sessiond_notap
+
+test_basic_error_path
+
+stop_lttng_sessiond_notap
+rmmod lttng-test
-else
- # Kernel tests are skipped.
- plan_tests $NUM_TESTS
- skip 0 "Root access is needed. Skipping all kernel notification tests."
$NUM_TESTS
-fi
rm -f "$TESTAPP_STATE_PATH"
diff --git a/tests/regression/tools/notification/test_notification_kernel_error
b/tests/regression/tools/notification/test_notification_kernel_error
index 891146747..895e35838 100755
--- a/tests/regression/tools/notification/test_notification_kernel_error
+++ b/tests/regression/tools/notification/test_notification_kernel_error
@@ -30,23 +30,28 @@ function test_basic_error_path
wait $APP_PID 2> /dev/null
}
+if [ "$(id -u)" != "0" ]; then
+ plan_skip_all "Root access is needed. Skipping all tests."
+ exit 0
+fi
-if [ "$(id -u)" == "0" ]; then
- validate_lttng_modules_present
+check_skip_kernel_test
- modprobe lttng-test
+if [ $? == 0 ]; then
+ plan_skip_all "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests."
+ exit 0
+fi
- start_lttng_sessiond_notap
+validate_lttng_modules_present
- test_basic_error_path
+modprobe lttng-test
- stop_lttng_sessiond_notap
- rmmod lttng-test
+start_lttng_sessiond_notap
+
+test_basic_error_path
+
+stop_lttng_sessiond_notap
+rmmod lttng-test
-else
- # Kernel tests are skipped.
- plan_tests $NUM_TESTS
- skip 0 "Root access is needed. Skipping all kernel notification tests."
$NUM_TESTS
-fi
rm -f "$TESTAPP_STATE_PATH"
diff --git
a/tests/regression/tools/notification/test_notification_kernel_instrumentation
b/tests/regression/tools/notification/test_notification_kernel_instrumentation
index b8f0c7eb8..9658fb0d3 100755
---
a/tests/regression/tools/notification/test_notification_kernel_instrumentation
+++
b/tests/regression/tools/notification/test_notification_kernel_instrumentation
@@ -28,22 +28,27 @@ function test_kernel_instrumentation_notification
wait $APP_PID 2> /dev/null
}
-if [ "$(id -u)" == "0" ]; then
- validate_lttng_modules_present
+if [ "$(id -u)" != "0" ]; then
+ plan_skip_all "Root access is needed. Skipping all tests."
+ exit 0
+fi
- modprobe lttng-test
+check_skip_kernel_test
- start_lttng_sessiond_notap
+if [ $? == 0 ]; then
+ plan_skip_all "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests."
+ exit 0
+fi
- test_kernel_instrumentation_notification
+validate_lttng_modules_present
- stop_lttng_sessiond_notap
- rmmod lttng-test
+modprobe lttng-test
-else
- # Kernel tests are skipped.
- plan_tests $NUM_TESTS
- skip 0 "Root access is needed. Skipping all kernel notification tests."
$NUM_TESTS
-fi
+start_lttng_sessiond_notap
+
+test_kernel_instrumentation_notification
+
+stop_lttng_sessiond_notap
+rmmod lttng-test
rm -f "$TESTAPP_STATE_PATH"
diff --git a/tests/regression/tools/notification/test_notification_multi_app
b/tests/regression/tools/notification/test_notification_multi_app
index 85d863804..3d2fe5b94 100755
--- a/tests/regression/tools/notification/test_notification_multi_app
+++ b/tests/regression/tools/notification/test_notification_multi_app
@@ -417,16 +417,24 @@ TESTS=(
test_on_register_evaluation_ust
)
-if [ "$(id -u)" == "0" ]; then
- validate_lttng_modules_present
- TESTS+=(
- test_multi_app_kernel
- test_on_register_evaluation_kernel
-)
-else
- skip 0 "Root access is needed. Skipping all kernel multi-app
notification tests." $NUM_TEST_KERNEL
+if [ "$(id -u)" != "0" ]; then
+ plan_skip_all "Root access is needed. Skipping all tests."
+ exit 0
+fi
+
+check_skip_kernel_test
+
+if [ $? == 0 ]; then
+ plan_skip_all "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests."
+ exit 0
fi
+validate_lttng_modules_present
+TESTS+=(
+test_multi_app_kernel
+test_on_register_evaluation_kernel
+)
+
for fct_test in ${TESTS[@]};
do
diff --git
a/tests/regression/tools/notification/test_notification_notifier_discarded_count
b/tests/regression/tools/notification/test_notification_notifier_discarded_count
index 1eb960d02..6751625c0 100755
---
a/tests/regression/tools/notification/test_notification_notifier_discarded_count
+++
b/tests/regression/tools/notification/test_notification_notifier_discarded_count
@@ -394,31 +394,37 @@ function
test_ust_notifier_discarded_regardless_trigger_owner
test_ust_notifier_discarded_count
test_ust_notifier_discarded_count_max_bucket
-if [ "$(id -u)" == "0" ]; then
+if [ "$(id -u)" != "0" ]; then
+ skip 0 "Root access is needed. Skipping all kernel notification tests."
$KERNEL_NUM_TESTS
+ exit 0
+fi
- validate_lttng_modules_present
+check_skip_kernel_test
- modprobe lttng-test
+if [ $? == 0 ]; then
+ skip 0 "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$KERNEL_NUM_TESTS
+ exit 0
+fi
- test_kernel_notifier_discarded_count
- test_kernel_notifier_discarded_count_max_bucket
+validate_lttng_modules_present
- if destructive_tests_enabled ; then
- # Those tests add a new user on the system. Since it's a quite
- # intrusive change to the system, we decide to only run it when
- # the user knows what they are doing.
- test_ust_notifier_discarded_count_multi_uid
- test_ust_notifier_discarded_regardless_trigger_owner
- else
- skip 0 "You need to set the LTTNG_ENABLE_DESTRUCTIVE_TESTS
environment variable to \"will-break-my-system\" to run this test"
$DESTRUCTIVE_TESTS_NUM
- fi
+modprobe lttng-test
- modprobe --remove lttng-test
+test_kernel_notifier_discarded_count
+test_kernel_notifier_discarded_count_max_bucket
- rm -rf "${sessiond_pipe[@]}" 2> /dev/null
+if destructive_tests_enabled ; then
+ # Those tests add a new user on the system. Since it's a quite
+ # intrusive change to the system, we decide to only run it when
+ # the user knows what they are doing.
+ test_ust_notifier_discarded_count_multi_uid
+ test_ust_notifier_discarded_regardless_trigger_owner
else
- # Kernel tests are skipped.
- skip 0 "Root access is needed. Skipping all kernel notification tests."
$KERNEL_NUM_TESTS
+ skip 0 "You need to set the LTTNG_ENABLE_DESTRUCTIVE_TESTS environment
variable to \"will-break-my-system\" to run this test" $DESTRUCTIVE_TESTS_NUM
fi
+modprobe --remove lttng-test
+
+rm -rf "${sessiond_pipe[@]}" 2> /dev/null
+
rm -rf "$TEST_TMPDIR"
diff --git a/tests/regression/tools/regen-metadata/test_kernel
b/tests/regression/tools/regen-metadata/test_kernel
index 7c4191a47..a7a4f421b 100755
--- a/tests/regression/tools/regen-metadata/test_kernel
+++ b/tests/regression/tools/regen-metadata/test_kernel
@@ -105,6 +105,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all kernel streaming tests."
$NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/tools/regen-statedump/test_kernel
b/tests/regression/tools/regen-statedump/test_kernel
index cb0c0ad5e..935424f30 100755
--- a/tests/regression/tools/regen-statedump/test_kernel
+++ b/tests/regression/tools/regen-statedump/test_kernel
@@ -45,6 +45,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all kernel streaming tests."
$NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/tools/rotation/test_kernel
b/tests/regression/tools/rotation/test_kernel
index 817019036..0fc3178a6 100755
--- a/tests/regression/tools/rotation/test_kernel
+++ b/tests/regression/tools/rotation/test_kernel
@@ -113,6 +113,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all kernel streaming tests."
$NUM_TESTS ||
{
validate_lttng_modules_present
diff --git a/tests/regression/tools/snapshots/test_kernel
b/tests/regression/tools/snapshots/test_kernel
index 870c437b2..f6b22c7aa 100755
--- a/tests/regression/tools/snapshots/test_kernel
+++ b/tests/regression/tools/snapshots/test_kernel
@@ -228,6 +228,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_TESTS ||
skip $isroot "Root access is needed. Skipping all kernel snapshot tests"
$NUM_TESTS ||
{
diff --git a/tests/regression/tools/tracker/test_event_tracker
b/tests/regression/tools/tracker/test_event_tracker
index 98ca990fc..16e2ea20a 100755
--- a/tests/regression/tools/tracker/test_event_tracker
+++ b/tests/regression/tools/tracker/test_event_tracker
@@ -474,6 +474,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_KERNEL_TESTS ||
skip $isroot "Root access is needed. Skipping all kernel tracker tests."
$NUM_KERNEL_TESTS ||
{
diag "Test kernel tracker"
diff --git a/tests/regression/tools/trigger/test_add_trigger_cli
b/tests/regression/tools/trigger/test_add_trigger_cli
index 9ba8c22f0..938801239 100755
--- a/tests/regression/tools/trigger/test_add_trigger_cli
+++ b/tests/regression/tools/trigger/test_add_trigger_cli
@@ -40,6 +40,9 @@ else
ist_root=0
fi
+check_skip_kernel_test
+ist_kernel=$?
+
function test_success ()
{
local test_name="$1"
@@ -223,6 +226,7 @@ test_success "--exclude-name two" "trigger5" \
--condition event-rule-matches --type=user --name='jean-*'
--exclude-name jean-chretien -x jean-charest \
--action notify
+skip $ist_kernel "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests." 18 ||
skip $ist_root "non-root user: skipping kprobe tests" 18 || {
i=0
@@ -262,6 +266,7 @@ skip $ist_root "non-root user: skipping kprobe tests" 18 ||
{
done
}
+skip $ist_kernel "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests." 6 ||
skip $ist_root "non-root user: skipping uprobe tests" 6 || {
test_success "--condition event-rule-matches uprobe" "uprobe-trigger-0"
\
--name="uprobe-trigger-0" \
@@ -274,6 +279,7 @@ skip $ist_root "non-root user: skipping uprobe tests" 6 || {
--action notify
}
+skip $ist_kernel "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests." 30 ||
skip $ist_root "non-root user: skipping syscall tests" 30 || {
test_success "--condition event-rule-matches one syscall"
"syscall-trigger-0" \
--name="syscall-trigger-0" \
diff --git a/tests/regression/tools/trigger/test_list_triggers_cli
b/tests/regression/tools/trigger/test_list_triggers_cli
index 6194b8891..6b61df206 100755
--- a/tests/regression/tools/trigger/test_list_triggers_cli
+++ b/tests/regression/tools/trigger/test_list_triggers_cli
@@ -51,6 +51,8 @@ else
hast_sdt_binary=0
fi
+check_skip_kernel_test
+ist_kernel=$?
test_top_level_options ()
{
@@ -2695,9 +2697,13 @@ start_lttng_sessiond_notap
test_top_level_options
test_event_rule_matches_tracepoint
+skip $ist_kernel "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests." 13 ||
skip $ist_root "non-root user: skipping kprobe tests" 13 ||
test_event_rule_matches_probe
+skip $ist_kernel "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests." 9 ||
skip $ist_root "non-root user: skipping uprobe tests" 9 ||
test_event_rule_matches_userspace_probe_elf
+skip $ist_kernel "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests." 9 ||
skip $(($ist_root && $hast_sdt_binary)) "skipping userspace probe SDT tests" 9
|| test_event_rule_matches_userspace_probe_sdt
+skip $ist_kernel "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all
tests." 17 ||
skip $ist_root "non-root user: skipping syscall tests" 17 ||
test_event_rule_matches_syscall
test_session_consumed_size_condition
test_buffer_usage_conditions
diff --git a/tests/regression/tools/wildcard/test_event_wildcard
b/tests/regression/tools/wildcard/test_event_wildcard
index 36e669b32..e14f4f450 100755
--- a/tests/regression/tools/wildcard/test_event_wildcard
+++ b/tests/regression/tools/wildcard/test_event_wildcard
@@ -132,6 +132,9 @@ else
isroot=0
fi
+check_skip_kernel_test
+
+skip $? "LTTNG_TOOLS_DISABLE_KERNEL_TESTS was set. Skipping all tests."
$NUM_KERNEL_TESTS ||
skip $isroot "Root access is needed. Skipping all kernel wildcard tests."
$NUM_KERNEL_TESTS ||
{
diag "Test kernel wildcards"
diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 44b3f167a..006a516c7 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -323,6 +323,17 @@ function conf_proc_count()
echo
}
+# Return 0 if disable kernel test was set
+function check_skip_kernel_test ()
+{
+ # Check for skip test kernel flag
+ if [ "$LTTNG_TOOLS_DISABLE_KERNEL_TESTS" == "1" ]; then
+ return 0
+ fi
+
+ return 1
+}
+
# Check if base lttng-modules are present.
# Bail out on failure
function validate_lttng_modules_present ()
--
2.25.1
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
