X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_event_basic;h=ac9ec05492cf2462f422af01b2fd19e2710dfc5b;hb=6f7eb8e1cb829926bcbce2aeb885b0db63fc7af0;hp=1a10a2ce23ab7acd62af68823c25a6dadaa1b7ec;hpb=e9826a9d6d6b27b10e653ee06adfcf95d17004e7;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_event_basic b/tests/regression/kernel/test_event_basic
index 1a10a2ce2..ac9ec0549 100755
--- a/tests/regression/kernel/test_event_basic
+++ b/tests/regression/kernel/test_event_basic
@@ -1,25 +1,15 @@
 #!/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 - Basic event"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
-NUM_TESTS=20
+NUM_TESTS=21
 
 TESTCMD="/bin/true"
 
@@ -27,7 +17,7 @@ source $TESTDIR/utils/utils.sh
 
 function test_event_basic()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_event_basic"
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -43,6 +33,7 @@ function test_event_basic()
 	eval ${TESTCMD}
 	stop_lttng_tracing_ok
 
+	validate_trace_path_kernel "$TRACE_PATH" ""
 	validate_trace "sched_switch" $TRACE_PATH
 	validate_trace "sched_process_exit" $TRACE_PATH
 	validate_trace "sched_process_fork" $TRACE_PATH
@@ -54,7 +45,7 @@ function test_event_basic()
 
 function test_enable_after_start()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_enable_after_start"
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -90,6 +81,7 @@ fi
 
 skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 {
+	validate_lttng_modules_present
 	start_lttng_sessiond
 
 	test_event_basic