X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_kernel;h=9ab43882c308ef88bc604f68e1671ed92a2eec43;hp=db529c53b75b8004a41284bc8621894683e72aa0;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hpb=7972aab22f74b18faa168c0482216a3dd711a075

diff --git a/tests/regression/tools/streaming/test_kernel b/tests/regression/tools/streaming/test_kernel
index db529c53b..9ab43882c 100755
--- a/tests/regression/tools/streaming/test_kernel
+++ b/tests/regression/tools/streaming/test_kernel
@@ -1,25 +1,14 @@
 #!/bin/bash
 #
-# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
+
 TEST_DESC="Streaming - Kernel tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="sched_switch"
-PID_RELAYD=0
 SESSION_NAME=""
 
 TRACE_PATH=$(mktemp -d)
@@ -28,39 +17,16 @@ NUM_TESTS=10
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
-# 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 lttng_create_session_uri
-{
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
-
-	ok $? "Create session $SESSION_NAME"
-}
-
 function test_kernel_before_start ()
 {
 	diag "Test kernel streaming with event enable BEFORE start"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $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.
-	diag "Wait 3 seconds for the trace to be written on disk"
-	for i in `seq 1 3`; do
-		sleep 1
-	done
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 # Deactivated since this feature is not yet available where we can enable
@@ -68,17 +34,19 @@ function test_kernel_before_start ()
 function test_kernel_after_start ()
 {
 	diag "Test kernel streaming with event enable AFTER start"
-	lttng_create_session_uri
-	start_lttng_tracing $SESSION_NAME
+	create_lttng_session_uri $SESSION_NAME net://localhost
+	start_lttng_tracing_ok $SESSION_NAME
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
 	# Give a second
 	sleep 1
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 if [ "$(id -u)" == "0" ]; then
 	isroot=1
 else
@@ -87,6 +55,8 @@ fi
 
 skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
 {
+	validate_lttng_modules_present
+
 	start_lttng_relayd "-o $TRACE_PATH"
 	start_lttng_sessiond