X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fregen-metadata%2Ftest_kernel;h=840be8e8515d7d2beb4bb62085ba363c5fb1cf79;hb=4ff750609549a99f6b318ce600c42c90d4f2e480;hp=0f879e6360b3c500720b6f302d264c3974f5b0ca;hpb=dbbc5b0a971a544a1b79dcf9d172259140dd7ac5;p=lttng-tools.git

diff --git a/tests/regression/tools/regen-metadata/test_kernel b/tests/regression/tools/regen-metadata/test_kernel
index 0f879e636..840be8e85 100755
--- a/tests/regression/tools/regen-metadata/test_kernel
+++ b/tests/regression/tools/regen-metadata/test_kernel
@@ -11,7 +11,7 @@ TESTDIR=$CURDIR/../../..
 EVENT_NAME="lttng_test_filter_event"
 SESSION_NAME=""
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_regen_metadata_kernel_trace_path.XXXXXX)
 
 NUM_TESTS=24
 
@@ -32,7 +32,7 @@ function test_kernel_streaming ()
 	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
 
 	# Find the metadata file
-	metadata_path=$(find "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"* | grep metadata)
+	metadata_path=$(find "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"* -name "metadata")
 
 	# Empty the metadata file
 	echo -n > "$metadata_path"
@@ -61,7 +61,7 @@ function test_kernel_local ()
 	validate_trace $EVENT_NAME "$TRACE_PATH"
 
 	# Find the metadata file
-	metadata_path=$(find "$TRACE_PATH"* | grep metadata)
+	metadata_path=$(find "$TRACE_PATH"* -name "metadata")
 
 	# Empty the metadata file
 	echo -n > "$metadata_path"
@@ -102,7 +102,7 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
 		${fct_test}
 	done
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 	stop_lttng_sessiond
 	stop_lttng_relayd
 }