Refactor: test: wrapper for destroy_lttng_session

[lttng-tools.git] / tests / regression / kernel / test_event_basic

diff --git a/tests/regression/kernel/test_event_basic b/tests/regression/kernel/test_event_basic
index 4de94dc670fe07a6b338fa40f9db5f9bf5e5801a..aeca02b687642a3efe54429a10c5046454bed77b 100755 (executable)
--- a/tests/regression/kernel/test_event_basic
+++ b/tests/regression/kernel/test_event_basic
@@ -19,31 +19,50 @@ TEST_DESC="Kernel tracer - Basic event"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
-NUM_TESTS=12
+NUM_TESTS=20
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 function test_event_basic()
 {
        TRACE_PATH=$(mktemp -d)
        SESSION_NAME="kernel_event_basic"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
        lttng_enable_kernel_event $SESSION_NAME "sched_switch"
        lttng_enable_kernel_event $SESSION_NAME "sched_process_exit"
        lttng_enable_kernel_event $SESSION_NAME "sched_process_free"
 
-       start_lttng_tracing
-       stop_lttng_tracing
+       start_lttng_tracing_ok
+       stop_lttng_tracing_ok
 
        validate_trace "sched_switch" $TRACE_PATH
        validate_trace "sched_process_exit" $TRACE_PATH
        validate_trace "sched_process_free" $TRACE_PATH
 
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
+
+       rm -rf $TRACE_PATH
+}
+
+function test_enable_after_start()
+{
+       TRACE_PATH=$(mktemp -d)
+       SESSION_NAME="kernel_enable_after_start"
+
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+
+       lttng_enable_kernel_event $SESSION_NAME "sched_switch"
+
+       start_lttng_tracing_ok
+       lttng_enable_kernel_event $SESSION_NAME "sched_process_exit"
+       stop_lttng_tracing_ok
+
+       validate_trace "sched_switch" $TRACE_PATH
+       validate_trace "sched_process_exit" $TRACE_PATH
+
+       destroy_lttng_session_ok $SESSION_NAME
 
        rm -rf $TRACE_PATH
 }
@@ -51,6 +70,8 @@ function test_event_basic()
 # MUST set TESTDIR before calling those functions
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 if [ "$(id -u)" == "0" ]; then
        isroot=1
 else
@@ -62,6 +83,7 @@ skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
        start_lttng_sessiond
 
        test_event_basic
+       test_enable_after_start
 
        stop_lttng_sessiond
 }