X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Ftools%2Fstreaming%2Frun-kernel;h=545cae7c825b605f01c034712041b36b490be5bb;hp=7d6324d296e79609b3d6a5b226ee128c7a2c2d4e;hb=785d2d0dc3aec3a4e44fcf677155dd07e8e4cc1f;hpb=ffe600149a7608221985751e1bf293234bf2545c

diff --git a/tests/tools/streaming/run-kernel b/tests/tools/streaming/run-kernel
index 7d6324d29..545cae7c8 100755
--- 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,8 +59,7 @@ 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
@@ -96,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