Tests: use modprobe to test for the presence of lttng-modules

[lttng-tools.git] / tests / regression / tools / snapshots / test_kernel_streaming

diff --git a/tests/regression/tools/snapshots/test_kernel_streaming b/tests/regression/tools/snapshots/test_kernel_streaming
index aa4c5b558af68d095e9dae5902989f37cfa2ce7c..bdbcc4929eda08bacb2dacc621644786d7aced4c 100755 (executable)
--- a/tests/regression/tools/snapshots/test_kernel_streaming
+++ b/tests/regression/tools/snapshots/test_kernel_streaming
@@ -29,12 +29,6 @@ NUM_TESTS=36
 
 source $TESTDIR/utils/utils.sh
 
-# LTTng kernel modules check
-out=`ls /lib/modules/$(uname -r)/extra | grep lttng`
-if [ -z "$out" ]; then
-       BAIL_OUT "LTTng modules not detected."
-fi
-
 function snapshot_add_output ()
 {
        local sess_name=$1
@@ -67,7 +61,7 @@ function test_kernel_default_name_with_del()
                return $?
        fi
 
-       lttng_snapshot_del_output $SESSION_NAME 1
+       lttng_snapshot_del_output_ok $SESSION_NAME 1
        snapshot_add_output $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
 
@@ -143,6 +137,8 @@ fi
 
 skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
 {
+       validate_lttng_modules_present
+
        start_lttng_relayd "-o $TRACE_PATH"
        start_lttng_sessiond