Tests: Add filtering tests for uncovered cases

[lttng-tools.git] / tests / tools / streaming / run-kernel

diff --git a/tests/tools/streaming/run-kernel b/tests/tools/streaming/run-kernel
index b87be13c50f5b191da036cd8f033864c6955b53a..7d6324d296e79609b3d6a5b226ee128c7a2c2d4e 100755 (executable)
--- a/tests/tools/streaming/run-kernel
+++ b/tests/tools/streaming/run-kernel
@@ -75,11 +75,20 @@ function test_kernel_before_start ()
        lttng_create_session
        lttng_enable_consumer_localhost
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
-       start_tracing $SESSION_NAME
+       start_lttng_tracing $SESSION_NAME
        # Give a second
        sleep 1
-       stop_tracing $SESSION_NAME
+       stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
+
+       # We can not predict _yet_ when the trace is available so we have to do a
+       # arbitratry sleep to validate the trace.
+       echo -n "Waiting 3 seconds for the trace to be written on disk "
+       for i in `seq 1 3`; do
+               echo -n "."
+               sleep 1
+       done
+       echo ""
 }
 
 # Deactivated since this feature is not yet available where we can enable
@@ -89,16 +98,16 @@ function test_kernel_after_start ()
        echo -e "\n=== Testing kernel streaming with event enable AFTER start\n"
        lttng_create_session
        lttng_enable_consumer_localhost
-       start_tracing $SESSION_NAME
+       start_lttng_tracing $SESSION_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
        # Give a second
        sleep 1
-       stop_tracing $SESSION_NAME
+       stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 }
 
-start_sessiond
-lttng_start_relayd "-o $TRACE_PATH"
+start_lttng_sessiond
+start_lttng_relayd "-o $TRACE_PATH"
 
 tests=( test_kernel_before_start )
 
@@ -118,8 +127,8 @@ do
 done
 
 echo ""
-stop_sessiond
-lttng_stop_relayd
+stop_lttng_sessiond
+stop_lttng_relayd
 
 
 exit $out