X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fdestructive%2Fmetadata-regeneration;h=b81e7af32d22d1c1614f8c55409392d61e28711f;hp=db4976302d5a045a364c798ee982e4ddace273b9;hb=33e557114a2ba28e26e220a833e8a449c78b8b65;hpb=fa1289fc106deb2f88249e1ebdcf87d9b493b2a6

diff --git a/tests/destructive/metadata-regeneration b/tests/destructive/metadata-regeneration
index db4976302..b81e7af32 100755
--- a/tests/destructive/metadata-regeneration
+++ b/tests/destructive/metadata-regeneration
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2015 Julien Desfossez <jdesfossez@efficios.com>
+# Copyright (C) 2015 Julien Desfossez <jdesfossez@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.
 
 # WARNING: this test changes the date of the system (and does not set it back).
 # This test sets the date of the current machine to $DATE1, creates a trace
@@ -28,7 +18,7 @@ TESTDIR=$CURDIR/..
 NUM_TESTS=44
 SESSION_NAME="regen"
 KERNEL_EVENT_NAME="lttng_test_filter_event"
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d -t tmp.metadata_regen_after_data_change.XXXXXX)
 
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
@@ -119,8 +109,8 @@ function test_kernel_streaming ()
 
 function test_ust_local ()
 {
-	local file_sync_after_first=$(mktemp -u)
-	local file_sync_before_last=$(mktemp -u)
+	local file_sync_after_first=$(mktemp --tmpdir -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp --tmpdir -u -t "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
 	diag "Test UST local with metadata regeneration"
 	date "+%Y-%m-%d %H:%M" -s "$DATE1 $HOUR" >/dev/null
@@ -157,8 +147,8 @@ function test_ust_local ()
 
 function test_ust_streaming ()
 {
-	local file_sync_after_first=$(mktemp -u)
-	local file_sync_before_last=$(mktemp -u)
+	local file_sync_after_first=$(mktemp --tmpdir -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp --tmpdir -u -t "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
 	diag "Test UST streaming with metadata regeneration"
 	date "+%Y-%m-%d %H:%M" -s "$DATE1 $HOUR" >/dev/null
@@ -215,7 +205,7 @@ skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 	modprobe lttng-test
 	test_kernel_local
 	test_kernel_streaming
-	rmmod lttng-test
+	modprobe --remove lttng-test
 
 	test_ust_local
 	test_ust_streaming