X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fdestructive%2Fmetadata-regeneration;h=449dc05be7749d4ecc0b1360b6a9e7f8153945c2;hb=c58be5fff5569f2959c79651e02af0a5f641ccb3;hp=dcb102ff4ae2eafc109092566170141ff8488cd7;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/destructive/metadata-regeneration b/tests/destructive/metadata-regeneration
index dcb102ff4..449dc05be 100755
--- a/tests/destructive/metadata-regeneration
+++ b/tests/destructive/metadata-regeneration
@@ -18,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"
@@ -38,16 +38,14 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
+
 function validate_trace_date
 {
 	local test_date=$1
 	local trace_path=$2
 
-	which $BABELTRACE_BIN >/dev/null
-	if [ $? -ne 0 ]; then
-	    skip 0 "Babeltrace binary not found. Skipping trace validation"
-	fi
-
 	res=$($BABELTRACE_BIN --clock-date $trace_path 2>/dev/null | head -1 | grep $test_date)
 	if [ $? -eq 0 ]; then
 		pass "Validate trace at date $test_date"
@@ -109,8 +107,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
@@ -147,8 +145,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
@@ -205,7 +203,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