X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmetadata%2Ftest_kernel;h=630fe2d4a4eb4c7b770fbf9c7be2728d43531e0c;hb=fc2dd19e2c7dbeaa86654b47c0a2c221b7018ecf;hp=8954a7f36b4e230db19d9cd1b25e4472d094d6a7;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/metadata/test_kernel b/tests/regression/tools/metadata/test_kernel
index 8954a7f36..630fe2d4a 100755
--- a/tests/regression/tools/metadata/test_kernel
+++ b/tests/regression/tools/metadata/test_kernel
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2019 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2019 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
 #
 # SPDX-License-Identifier: LGPL-2.1-only
 
@@ -45,7 +45,7 @@ function test_kernel ()
 	# bt1 accepts only a directory while bt2 accepts either the metadata
 	# file directly or a directory with an immediate metadata file.
 	# Settle for the common denominator.
-	metadata_path=$(find "${expected_path}/${session_name}"* | grep metadata)
+	metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
 	metadata_path=$(dirname "$metadata_path")
 
 	$BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" > "$metadata"
@@ -119,7 +119,7 @@ skip $isroot "Root access is needed. Skipping all kernel metadata tests." $NUM_T
 		${fct_test}
 	done
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 
 	stop_lttng_sessiond
 	unset LTTNG_HOME