X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_rotation_destroy_flush;h=6e568afda769cae29dd40fb41d913e9470df367e;hb=8d5a3312b34841f1ecba2605acad3eaca79fd5e4;hp=03933a3af18e4079f8b1a6bfa9e28cc921a04376;hpb=3be453c9ec6469235f0dc6cdaec9d55f0a6ee517;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_rotation_destroy_flush b/tests/regression/kernel/test_rotation_destroy_flush
index 03933a3af..6e568afda 100755
--- a/tests/regression/kernel/test_rotation_destroy_flush
+++ b/tests/regression/kernel/test_rotation_destroy_flush
@@ -1,20 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
-# Copyright (C) - 2014, 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2013 Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) 2014, 2016 Mathieu Desnoyers <mathieu.desnoyers@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 - Rotation destroy flush"
 
@@ -39,7 +29,7 @@ source $TESTDIR/utils/utils.sh
 function signal_cleanup()
 {
 	diag "*** Exiting ***"
-	modprobe -r lttng-test
+	modprobe --remove lttng-test
 	full_cleanup
 }
 
@@ -106,7 +96,7 @@ function test_rotation_destroy_flush_single()
 
 	rm -rf $TRACE_PATH
 
-	modprobe -r lttng-test
+	modprobe --remove lttng-test
 	stop_lttng_sessiond
 }
 
@@ -138,11 +128,12 @@ fi
 
 skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 {
+	validate_lttng_modules_present
 	trap signal_cleanup SIGTERM SIGINT
 
 	while [ "$i" -lt "$TEST_COUNT" ]; do
 
-		TRACE_PATH=$(mktemp -d)
+		TRACE_PATH=$(mktemp -d -t tmp.test_kernel_rotation_destroy_flush.XXXXXX)
 
 		# Execute test
 		${TESTS[$i]}