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).
If the lttng modules(.ko files) is not present during the test,
it would end up with lots of failing.
Adding a function in utils.sh to detect whether lttng modules are
installed to target rootfs.
Also applied this function to test scripts, if modules not exist,
skip the test case instead of end up whole testing.
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 +++
tests/regression/kernel/test_ns_contexts_change | 3 +++
tests/regression/kernel/test_rotation_destroy_flush | 3 +++
tests/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 +++
tests/regression/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 | 9 +++++++++
.../notification/test_notification_kernel_capture | 8 ++++++++
.../notification/test_notification_kernel_error | 8 ++++++++
.../test_notification_kernel_instrumentation | 9 +++++++++
.../tools/notification/test_notification_multi_app | 7 +++++++
.../test_notification_notifier_discarded_count | 7 +++++++
tests/regression/tools/regen-metadata/test_kernel | 3 +++
tests/regression/tools/regen-statedump/test_kernel | 3 +++
tests/regression/tools/rotation/test_kernel | 3 +++
tests/regression/tools/snapshots/test_kernel | 3 +++
tests/regression/tools/tracker/test_event_tracker | 3 +++
tests/regression/tools/trigger/test_add_trigger_cli | 3 +++
.../regression/tools/trigger/test_list_triggers_cli | 6 ++++++
tests/regression/tools/wildcard/test_event_wildcard | 3 +++
.../test_rotation_destroy_flush | 7 +++++++
tests/utils/utils.sh | 13 +++++++++++++
37 files changed, 162 insertions(+)
diff --git a/tests/destructive/metadata-regeneration
b/tests/destructive/metadata-regeneration
index 048c601b6..d5ae0592a 100755
--- a/tests/destructive/metadata-regeneration
+++ b/tests/destructive/metadata-regeneration
@@ -202,6 +202,9 @@ if ! destructive_tests_enabled ; then
exit 0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..4a5a33235 100644
--- a/tests/perf/test_perf_raw.in
+++ b/tests/perf/test_perf_raw.in
@@ -154,6 +154,9 @@ have_libpfm
test_ust_raw
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..b7cc100d6 100755
--- a/tests/regression/kernel/test_all_events
+++ b/tests/regression/kernel/test_all_events
@@ -49,6 +49,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..0e0ec094b 100755
--- a/tests/regression/kernel/test_callstack
+++ b/tests/regression/kernel/test_callstack
@@ -142,6 +142,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..46e4d228c 100755
--- a/tests/regression/kernel/test_channel
+++ b/tests/regression/kernel/test_channel
@@ -53,6 +53,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..bc80a0f16 100755
--- a/tests/regression/kernel/test_clock_override
+++ b/tests/regression/kernel/test_clock_override
@@ -180,6 +180,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..fa7066bab 100755
--- a/tests/regression/kernel/test_event_basic
+++ b/tests/regression/kernel/test_event_basic
@@ -79,6 +79,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..ed83c081a 100755
--- a/tests/regression/kernel/test_kernel_function
+++ b/tests/regression/kernel/test_kernel_function
@@ -49,6 +49,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..5842f4d13 100755
--- a/tests/regression/kernel/test_lttng_logger
+++ b/tests/regression/kernel/test_lttng_logger
@@ -116,6 +116,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..19d308272 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
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..43df40c68 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
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..1a9dd6c1f 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
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..72fae27ec 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"
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..e43a4a9d0 100755
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -670,6 +670,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..a5d34c52a 100755
--- a/tests/regression/kernel/test_userspace_probe
+++ b/tests/regression/kernel/test_userspace_probe
@@ -821,6 +821,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..33e375ea2 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
)
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..35e8542c2 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
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..a7c964d40 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
+detect_lttng_modules_installed
+skip $? "LTTng modules not detected. 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..6d2b2c1b5 100755
--- a/tests/regression/tools/live/test_kernel
+++ b/tests/regression/tools/live/test_kernel
@@ -47,6 +47,14 @@ else
exit 0
fi
+detect_lttng_modules_installed
+
+if [ $? == 0 ]; then
+ plan_skip_all "LTTng modules not detected. 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..2b0ddb2f7 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
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..fabedc799 100755
--- a/tests/regression/tools/metadata/test_kernel
+++ b/tests/regression/tools/metadata/test_kernel
@@ -104,6 +104,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..ec4dc3255 100755
--- a/tests/regression/tools/notification/test_notification_kernel_buffer_usage
+++ b/tests/regression/tools/notification/test_notification_kernel_buffer_usage
@@ -63,8 +63,17 @@ function test_buffer_usage_notification
wait $APP_PID 2> /dev/null
}
+detect_lttng_modules_installed
+ismodready=$?
+
if [ "$(id -u)" == "0" ]; then
+ if [ $ismodready == 0 ];then
+ plan_tests $NUM_TESTS
+ skip 0 "LTTng modules not detected. Skipping all tests."
$NUM_TESTS
+ exit 0
+ fi
+
validate_lttng_modules_present
diff --git
a/tests/regression/tools/notification/test_notification_kernel_capture
b/tests/regression/tools/notification/test_notification_kernel_capture
index 88a3691eb..cdb07bb77 100755
--- a/tests/regression/tools/notification/test_notification_kernel_capture
+++ b/tests/regression/tools/notification/test_notification_kernel_capture
@@ -30,8 +30,16 @@ function test_basic_error_path
wait $APP_PID 2> /dev/null
}
+detect_lttng_modules_installed
+ismodready=$?
if [ "$(id -u)" == "0" ]; then
+ if [ $ismodready == 0 ];then
+ plan_tests $NUM_TESTS
+ skip 0 "LTTng modules not detected. Skipping all tests."
$NUM_TESTS
+ exit 0
+ fi
+
validate_lttng_modules_present
modprobe lttng-test
diff --git a/tests/regression/tools/notification/test_notification_kernel_error
b/tests/regression/tools/notification/test_notification_kernel_error
index 891146747..2a5454c47 100755
--- a/tests/regression/tools/notification/test_notification_kernel_error
+++ b/tests/regression/tools/notification/test_notification_kernel_error
@@ -30,8 +30,16 @@ function test_basic_error_path
wait $APP_PID 2> /dev/null
}
+detect_lttng_modules_installed
+ismodready=$?
if [ "$(id -u)" == "0" ]; then
+ if [ $ismodready == 0 ]; then
+ plan_tests $NUM_TESTS
+ skip 0 "LTTng modules not detected. Skipping all tests."
$NUM_TESTS
+ exit 0
+ fi
+
validate_lttng_modules_present
modprobe lttng-test
diff --git
a/tests/regression/tools/notification/test_notification_kernel_instrumentation
b/tests/regression/tools/notification/test_notification_kernel_instrumentation
index b8f0c7eb8..1979a10b9 100755
---
a/tests/regression/tools/notification/test_notification_kernel_instrumentation
+++
b/tests/regression/tools/notification/test_notification_kernel_instrumentation
@@ -28,7 +28,16 @@ function test_kernel_instrumentation_notification
wait $APP_PID 2> /dev/null
}
+detect_lttng_modules_installed
+ismodready=$?
+
if [ "$(id -u)" == "0" ]; then
+ if [ $ismodready == 0 ]; then
+ plan_tests $NUM_TESTS
+ skip 0 "LTTng modules not detected. Skipping all tests."
$NUM_TESTS
+ exit 0
+ fi
+
validate_lttng_modules_present
modprobe lttng-test
diff --git a/tests/regression/tools/notification/test_notification_multi_app
b/tests/regression/tools/notification/test_notification_multi_app
index 85d863804..3fc191ca6 100755
--- a/tests/regression/tools/notification/test_notification_multi_app
+++ b/tests/regression/tools/notification/test_notification_multi_app
@@ -417,7 +417,14 @@ TESTS=(
test_on_register_evaluation_ust
)
+detect_lttng_modules_installed
+ismodready=$?
+
if [ "$(id -u)" == "0" ]; then
+ if [ ismodready == 0 ]; then
+ skip 0 "LTTng modules not detected. Skipping all tests."
$NUM_TEST_KERNEL
+ exit 0
+ fi
validate_lttng_modules_present
TESTS+=(
test_multi_app_kernel
diff --git
a/tests/regression/tools/notification/test_notification_notifier_discarded_count
b/tests/regression/tools/notification/test_notification_notifier_discarded_count
index 1eb960d02..ffe159931 100755
---
a/tests/regression/tools/notification/test_notification_notifier_discarded_count
+++
b/tests/regression/tools/notification/test_notification_notifier_discarded_count
@@ -393,9 +393,16 @@ function
test_ust_notifier_discarded_regardless_trigger_owner
test_ust_notifier_discarded_count
test_ust_notifier_discarded_count_max_bucket
+detect_lttng_modules_installed
+ismodready=$?
if [ "$(id -u)" == "0" ]; then
+ if [ $ismodready == 0 ]; then
+ skip 0 "LTTng modules not detected. Skipping all tests."
$KERNEL_NUM_TESTS
+ exit 1
+ fi
+
validate_lttng_modules_present
modprobe lttng-test
diff --git a/tests/regression/tools/regen-metadata/test_kernel
b/tests/regression/tools/regen-metadata/test_kernel
index 7c4191a47..1ef048038 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
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..7e412774c 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
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..c3118981c 100755
--- a/tests/regression/tools/rotation/test_kernel
+++ b/tests/regression/tools/rotation/test_kernel
@@ -113,6 +113,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..44f4b315d 100755
--- a/tests/regression/tools/snapshots/test_kernel
+++ b/tests/regression/tools/snapshots/test_kernel
@@ -228,6 +228,9 @@ else
isroot=0
fi
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..1efc2209d 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
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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..4e7fe54d5 100755
--- a/tests/regression/tools/trigger/test_add_trigger_cli
+++ b/tests/regression/tools/trigger/test_add_trigger_cli
@@ -223,6 +223,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 detect_lttng_modules_installed "LTTng modules not detected. Skipping all
tests." 18 ||
skip $ist_root "non-root user: skipping kprobe tests" 18 || {
i=0
@@ -262,6 +263,7 @@ skip $ist_root "non-root user: skipping kprobe tests" 18 ||
{
done
}
+skip detect_lttng_modules_installed "LTTng modules not detected. 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 +276,7 @@ skip $ist_root "non-root user: skipping uprobe tests" 6 || {
--action notify
}
+skip detect_lttng_modules_installed "LTTng modules not detected. 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..0567eef41 100755
--- a/tests/regression/tools/trigger/test_list_triggers_cli
+++ b/tests/regression/tools/trigger/test_list_triggers_cli
@@ -2689,15 +2689,21 @@ test_notify_action ()
}
plan_tests $NUM_TESTS
+detect_lttng_modules_installed
+ismodready=$?
# shellcheck disable=SC2119
start_lttng_sessiond_notap
test_top_level_options
test_event_rule_matches_tracepoint
+skip $ismodready "LTTng modules not detected. Skipping all tests." 13 ||
skip $ist_root "non-root user: skipping kprobe tests" 13 ||
test_event_rule_matches_probe
+skip $ismodready "LTTng modules not detected. Skipping all tests." 9 ||
skip $ist_root "non-root user: skipping uprobe tests" 9 ||
test_event_rule_matches_userspace_probe_elf
+skip $ismodready "LTTng modules not detected. Skipping all tests." 9 ||
skip $(($ist_root && $hast_sdt_binary)) "skipping userspace probe SDT tests" 9
|| test_event_rule_matches_userspace_probe_sdt
+skip $ismodready "LTTng modules not detected. 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..fbc4db958 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
+detect_lttng_modules_installed
+
+skip $? "LTTng modules not detected. 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/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush
b/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush
index 669bcbc43..a9772ecf9 100755
--- a/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush
+++ b/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush
@@ -117,6 +117,13 @@ function test_rotation_destroy_flush()
plan_tests $NUM_TESTS
+detect_lttng_modules_installed
+
+if [ $? == 0 ]; then
+ skip 0 "LTTng modules not detected. Skipping all tests." $NUM_TESTS
+ exit 0
+fi
+
print_test_banner "$TEST_DESC"
TESTS=(
diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 44b3f167a..f5cb23056 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -323,6 +323,19 @@ function conf_proc_count()
echo
}
+# Check if target rootfs have installed lttng modules.
+# Return 0 if target rootfs don't have lttng module
+function detect_lttng_modules_installed ()
+{
+ # Check for modules
+ KMOD_PATH=`modprobe lttng-tracer -n -v |cut -d ' ' -f2`
+ if [ -f $KMOD_PATH ]; then
+ return 1
+ fi
+
+ return 0
+}
+
# Check if base lttng-modules are present.
# Bail out on failure
function validate_lttng_modules_present ()
--
2.35.5
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
