Tests: lttng_snapshot_add_output_ok: allow specifying output type

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

diff --git a/tests/regression/tools/snapshots/test_kernel b/tests/regression/tools/snapshots/test_kernel
index 886c4557a513732b093f53c61f5f6992ca016445..06d16c75703b3b842917cceb6e44a7fd1dc98088 100755 (executable)
--- a/tests/regression/tools/snapshots/test_kernel
+++ b/tests/regression/tools/snapshots/test_kernel
@@ -19,7 +19,6 @@ TEST_DESC="Snapshots - Kernel tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="sched_switch"
-PID_RELAYD=0
 SESSION_NAME=""
 CHANNEL_NAME="snapchan"
 
@@ -29,12 +28,6 @@ NUM_TESTS=2060
 
 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 test_kernel_local_snapshot ()
 {
        diag "Test local kernel snapshots"
@@ -42,7 +35,7 @@ function test_kernel_local_snapshot ()
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
        lttng_snapshot_record $SESSION_NAME
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -65,7 +58,7 @@ function test_kernel_local_snapshot_after_stop ()
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
        stop_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
        lttng_snapshot_record $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
 
@@ -89,7 +82,7 @@ function test_kernel_local_snapshot_append_to_metadata ()
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT1 $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
        # first snapshot with only 1 event
        lttng_snapshot_record $SESSION_NAME
@@ -134,7 +127,7 @@ function test_kernel_local_snapshot_discard ()
                        $CHANNEL_NAME
        lttng_enable_kernel_syscall_ok $SESSION_NAME -a $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
        true_loop_cpu0 10000
 
@@ -172,7 +165,7 @@ function test_kernel_local_snapshot_overwrite_small_buffers ()
                        $CHANNEL_NAME
        lttng_enable_kernel_syscall_ok $SESSION_NAME -a $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
        true_loop_cpu0 10000
 
@@ -211,7 +204,7 @@ function test_kernel_1000_local_snapshots ()
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
-       lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+       lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
        for i in $(seq 1 $NB_SNAP); do
                diag "Snapshot $i/$NB_SNAP"
                rm -rf $TRACE_PATH/snapshot/* 2>/dev/null
@@ -241,6 +234,9 @@ fi
 
 skip $isroot "Root access is needed. Skipping all kernel snapshot tests." $NUM_TESTS ||
 {
+
+       validate_lttng_modules_present
+
        start_lttng_sessiond
 
        #tests=( test_kernel_1000_local_snapshots )