X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Ftest_kernel;h=df30fcf56242e940ec974af197414de788bf95fe;hb=3a1744008331a0604479d3d7461f77056fad3a64;hp=0e542da6a6b76f6010e7e75649a1db0da491f7a6;hpb=05aa48da927bdd0ae848f2c704c0a3389480d982;p=lttng-tools.git

diff --git a/tests/regression/tools/live/test_kernel b/tests/regression/tools/live/test_kernel
index 0e542da6a..df30fcf56 100755
--- a/tests/regression/tools/live/test_kernel
+++ b/tests/regression/tools/live/test_kernel
@@ -1,37 +1,22 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 Julien Desfossez <julien.desfossez@efficios.com>
-#                      David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2013 Julien Desfossez <julien.desfossez@efficios.com>
+# Copyright (C) 2013 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="Live - Kernel space tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
-LTTNG_BIN="lttng"
-BABELTRACE_BIN="babeltrace"
 NR_ITER=1
 NR_USEC_WAIT=1
 DELAY_USEC=2000000
 
 SESSION_NAME="live"
-EVENT_NAME="sched_switch"
+EVENT_NAME="lttng_test_filter_event"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_live_kernel_trace_path.XXXXXX)
 
 DIR=$(readlink -f $TESTDIR)
 
@@ -54,19 +39,21 @@ function clean_live_tracing()
 	rm -rf $TRACE_PATH
 }
 
-# Need root access for kernel tracing.
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-else
-	echo "Root access is needed. Skipping all tests."
+check_skip_kernel_test &&
+{
+	plan_skip_all "Skipping all tests."
 	exit 0
-fi
+}
+
+modprobe lttng-test
 
 start_lttng_sessiond_notap
 start_lttng_relayd_notap "-o $TRACE_PATH"
 
 setup_live_tracing
 
+echo -n "1" > /proc/lttng-test-filter-event
+
 # Start the live test
 $TESTDIR/regression/tools/live/live_test
 
@@ -74,3 +61,5 @@ clean_live_tracing
 
 stop_lttng_relayd_notap
 stop_lttng_sessiond_notap
+
+modprobe --remove lttng-test