X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmetadata%2Ftest_kernel;h=08743008bccf339052669b31cca6756d0b8b1da6;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;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..08743008b 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
 
@@ -10,7 +10,7 @@ CURDIR=$(dirname "$0")/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="lttng_test_filter_event"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_metadata_env_kernel_trace_path.XXXXXX)
 
 NUM_TESTS=13
 
@@ -21,16 +21,13 @@ source "$CURDIR/utils.sh"
 
 function test_kernel ()
 {
-	local metadata
-	local metadata_env
 	local metadata_path
 	local value
 
 	local expected_path="${TRACE_PATH}/lttng-traces"
 	local session_name="kernel"
-
-	metadata=$(mktemp)
-	metadata_env=$(mktemp)
+	local metadata=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_metadata.XXXXXX")
+	local metadata_env=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_metadata_env.XXXXXX")
 
 	diag "Test Kernel metadata env field"
 	create_lttng_session_ok "$session_name"
@@ -45,7 +42,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"
@@ -93,6 +90,7 @@ function test_kernel ()
 plan_tests $NUM_TESTS
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
 
 if [ "$(id -u)" == "0" ]; then
 	isroot=1
@@ -119,7 +117,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