Deprecate enable/disable-consumer

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

diff --git a/tests/tools/streaming/run-kernel b/tests/tools/streaming/run-kernel
index b64f233b8fa612f27ff307b56e8409c36e5cac74..545cae7c825b605f01c034712041b36b490be5bb 100755 (executable)
--- a/tests/tools/streaming/run-kernel
+++ b/tests/tools/streaming/run-kernel
@@ -43,24 +43,11 @@ if [ -z "$out" ]; then
        exit 0
 fi
 
-function lttng_create_session
+function lttng_create_session_uri
 {
        echo -n "Creating session $SESSION_NAME... "
        # Create session with default path
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME >/dev/null 2>&1
-       if [ $? -eq 1 ]; then
-               print_fail
-               return 1
-       else
-               print_ok
-       fi
-}
-
-function lttng_enable_consumer_localhost
-{
-       echo -n "Enabling network consumer... "
-       # Create session with default path
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-consumer -k net://localhost >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
        if [ $? -eq 1 ]; then
                print_fail
                return 1
@@ -72,14 +59,22 @@ function lttng_enable_consumer_localhost
 function test_kernel_before_start ()
 {
        echo -e "\n=== Testing kernel streaming with event enable BEFORE start\n"
-       lttng_create_session
-       lttng_enable_consumer_localhost
+       lttng_create_session_uri
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
        start_lttng_tracing $SESSION_NAME
        # Give a second
        sleep 1
        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
@@ -87,8 +82,7 @@ function test_kernel_before_start ()
 function test_kernel_after_start ()
 {
        echo -e "\n=== Testing kernel streaming with event enable AFTER start\n"
-       lttng_create_session
-       lttng_enable_consumer_localhost
+       lttng_create_session_uri
        start_lttng_tracing $SESSION_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
        # Give a second