X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_all_events;h=2fb2f611da69069ff7f01e30568b3115e874ee20;hp=9ea847b486a9ad3be28fa5b4fc9a0a33fa7fa8a0;hb=HEAD;hpb=96340a015194538227efcbc654ec02c2ed9961ce

diff --git a/tests/regression/kernel/test_all_events b/tests/regression/kernel/test_all_events
index 9ea847b48..dd6dab5e5 100755
--- a/tests/regression/kernel/test_all_events
+++ b/tests/regression/kernel/test_all_events
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) 2013 Christian Babeux <christian.babeux@efficios.com>
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# This program 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 General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 TEST_DESC="Kernel tracer - All events"
 
@@ -21,11 +11,13 @@ CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
 NUM_TESTS=8
 
+TESTCMD="/bin/true"
+
 source $TESTDIR/utils/utils.sh
 
 function test_all_event()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_all_events_basic"
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -33,11 +25,15 @@ function test_all_event()
 	lttng_enable_kernel_event $SESSION_NAME
 
 	start_lttng_tracing_ok
+
+	# Running a process and waiting for its completion forces the triggering of a
+	# sched_switch event
+	eval ${TESTCMD}
 	stop_lttng_tracing_ok
 
 	validate_trace "sched_switch" $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -47,14 +43,9 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-else
-	isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
+check_skip_kernel_test "$NUM_TESTS" "Skipping all tests." ||
 {
+	validate_lttng_modules_present
 	start_lttng_sessiond
 
 	test_all_event