X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Fclear%2Ftest_kernel;h=01065748b898e192e0225be8b1477c602f067179;hb=d0e263e7e628d2eba76c883ffc6fb92065e440c7;hp=01232863fb2b9fdc25a4aff150c54a6e010679a4;hpb=c28fcefd993b7539716bb5cd9557a08a217ec463;p=lttng-tools.git

diff --git a/tests/regression/tools/clear/test_kernel b/tests/regression/tools/clear/test_kernel
index 01232863f..01065748b 100755
--- a/tests/regression/tools/clear/test_kernel
+++ b/tests/regression/tools/clear/test_kernel
@@ -1,19 +1,8 @@
 #!/bin/bash
 #
-# Copyright (C) - 2019 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2019 Jonathan Rajotte <jonathan.rajotte-julien@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="Clear - Kernel tracing"
 
@@ -31,7 +20,7 @@ source $TESTDIR/utils/utils.sh
 function signal_cleanup ()
 {
 	stop_lttng_sessiond
-	modprobe -r lttng-test
+	modprobe --remove lttng-test
 	full_cleanup
 }
 
@@ -39,7 +28,7 @@ function clean_path ()
 {
 	local trace_path=$1
 	set -u
-	rm -rf $trace_path/*
+	rm -rf $trace_path
 	set +u
 }
 
@@ -631,7 +620,7 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
 		clean_path $TRACE_PATH
 	done
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 	stop_lttng_sessiond
 	stop_lttng_relayd