X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_clock_override;h=524c3c3bb4014e6737459b0796648bf9899c7a16;hb=8d5a3312b34841f1ecba2605acad3eaca79fd5e4;hp=1fbba7717884ce60252a7bc770a6876268d1082f;hpb=3be453c9ec6469235f0dc6cdaec9d55f0a6ee517;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_clock_override b/tests/regression/kernel/test_clock_override
index 1fbba7717..524c3c3bb 100755
--- a/tests/regression/kernel/test_clock_override
+++ b/tests/regression/kernel/test_clock_override
@@ -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 - Clock override plugin"
 
@@ -50,7 +40,7 @@ function signal_cleanup()
 {
 	diag "*** Exiting ***"
 	stop_lttng_sessiond
-	modprobe -r lttng-test lttng-clock-plugin-test lttng-clock
+	modprobe --remove lttng-test lttng-clock-plugin-test lttng-clock
 	full_cleanup
 }
 
@@ -74,8 +64,8 @@ function extract_clock_metadata_token()
 
 function test_clock_override_metadata()
 {
-	local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXXX)
-	local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXXX)
+	local ctf_metadata_file=$(TMPDIR="$TRACE_PATH" mktemp -t ctf-metadata.XXXXXX)
+	local clock_metadata_file=$(TMPDIR="$TRACE_PATH" mktemp -t clock-metadata.XXXXXX)
 	local result=""
 
 	diag "Clock override plugin metadata test"
@@ -92,7 +82,7 @@ function test_clock_override_metadata()
 	destroy_lttng_session_ok $SESSION_NAME
 
 	stop_lttng_sessiond
-	modprobe -r lttng-test lttng-clock-plugin-test lttng-clock
+	modprobe --remove lttng-test lttng-clock-plugin-test lttng-clock
 
 	local TRACE_METADATA_FILE_PATH="$(find "$TRACE_PATH" -name metadata -type f)"
 	local TRACE_METADATA_DIR="$(dirname "$TRACE_METADATA_FILE_PATH")"
@@ -140,7 +130,7 @@ function test_clock_override_timestamp()
 		cut -d, -f1 | uniq | wc -l)
 	test $unique_timestamps_count -gt 1
 	ok $? "Unique event timestamps without clock override: $unique_timestamps_count expect >1"
-	rmmod lttng-test
+	modprobe --remove lttng-test
 	stop_lttng_sessiond
 
 	# Test with clock override plugin.
@@ -158,10 +148,8 @@ function test_clock_override_timestamp()
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
 
-	rmmod lttng-test
 	stop_lttng_sessiond
-	rmmod lttng-clock-plugin-test
-	rmmod lttng-clock
+	modprobe --remove lttng-test lttng-clock-plugin-test lttng-clock
 
 	# Use Babeltrace with "-n all" to give a comma separated list for
 	# easy extraction of timestamps.
@@ -176,6 +164,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 TESTS=(
 	"test_clock_override_metadata"
 	"test_clock_override_timestamp"
@@ -192,11 +182,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_clock_override_trace_path.XXXXXX)
 
 		# Execute test
 		${TESTS[$i]}