X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Fcrash%2Ftest_crash;h=73e1e4f694816762aaad5a7f52dd7ab6c42bc774;hb=33e557114a2ba28e26e220a833e8a449c78b8b65;hp=8a7bccae51cb342dab2bd2e484d0141e4fb78df1;hpb=6c4a91d639747f260ab46decebc50998ef063712;p=lttng-tools.git

diff --git a/tests/regression/tools/crash/test_crash b/tests/regression/tools/crash/test_crash
index 8a7bccae5..73e1e4f69 100755
--- a/tests/regression/tools/crash/test_crash
+++ b/tests/regression/tools/crash/test_crash
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2015 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2015 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
+# SPDX-License-Identifier: LGPL-2.1-only
 #
-# This library 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 Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 TEST_DESC="LTTng-crash & shm testing"
 
@@ -29,7 +19,7 @@ NR_USEC_WAIT=0
 NR_ITER=-1
 
 # Temp file output
-OUTPUT_DIR=$(mktemp -d)
+OUTPUT_DIR=$(mktemp -d --tmpdir tmp.test_crash_shm.XXXXXX)
 
 LAST_APP_PID=
 
@@ -47,7 +37,7 @@ print_test_banner "$TEST_DESC"
 
 function start_test_app()
 {
-	local tmp_file=$(mktemp -u)
+	local tmp_file=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}.XXXXXX")
 
 	# Start application with a temporary file.
 	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event $tmp_file &
@@ -103,7 +93,7 @@ function test_shm_path_per_pid()
 	diag "Shm: ust per-pid test"
 	local session_name=shm_path_per_pid
 	local channel_name=channel_per_pid
-	local shm_path=$(mktemp -d)
+	local shm_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_shm.XXXXXX")
 
 	# Build up
 	start_lttng_sessiond
@@ -175,7 +165,9 @@ function test_shm_path_per_uid()
 	diag "Shm: ust per-uid test"
 	local session_name=shm_path_per_uid
 	local channel_name=channel_per_uid
-	local shm_path=$(mktemp -d)
+	set -x
+	local shm_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
+	set +x
 
 	# Build up
 	start_lttng_sessiond
@@ -226,8 +218,8 @@ function test_lttng_crash()
 	diag "Lttng-crash: basic recuperation"
 	local session_name=crash_test
 	local channel_name=channel_crash
-	local shm_path=$(mktemp -d)
-	local shm_path_symlink=$(mktemp -d)
+	local shm_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
+	local shm_path_symlink=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_shm_path_symlink.XXXXXX")
 	local event_name="tp:tptest"
 
 	# Create a session in snapshot mode to deactivate any use of consumerd
@@ -263,8 +255,8 @@ function test_lttng_crash_extraction()
 	diag "Lttng-crash: extraction to path"
 	local session_name=crash_test
 	local channel_name=channel_crash
-	local shm_path=$(mktemp -d)
-	local extraction_dir_path=$(mktemp -d)
+	local shm_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
+	local extraction_dir_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_extraction_dir_path.XXXXXX")
 	local extraction_path=$extraction_dir_path/extract
 	local event_name="tp:tptest"
 
@@ -297,7 +289,7 @@ function test_shm_path_per_pid_sigint()
 	diag "Shm: ust per-pid test sigint"
 	local session_name=shm_path_per_pid
 	local channel_name=channel_per_pid
-	local shm_path=$(mktemp -d)
+	local shm_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
 	local num_files=0
 
 	# Build up
@@ -328,7 +320,7 @@ function test_shm_path_per_uid_sigint()
 	diag "Shm: ust per-uid test sigint"
 	local session_name=shm_path_per_uid_sigint
 	local channel_name=channel_per_uid_sigint
-	local shm_path=$(mktemp -d)
+	local shm_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
 	local ret=0
 
 	# Build up
@@ -359,8 +351,8 @@ function test_lttng_crash_extraction_sigkill()
 	diag "Lttng-crash: extraction with sigkill"
 	local session_name=crash_test
 	local channel_name=channel_crash
-	local shm_path=$(mktemp -d)
-	local extraction_dir_path=$(mktemp -d)
+	local shm_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
+	local extraction_dir_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_extraction_dir_path.XXXXXX")
 	local extraction_path=$extraction_dir_path/extract
 	local event_name="tp:tptest"
 	local ret=0
@@ -402,8 +394,8 @@ function interrupt_cleanup()
 }
 
 TESTS=(
-	test_shm_path_per_uid
 	test_shm_path_per_pid
+	test_shm_path_per_uid
 	test_shm_path_per_pid_sigint
 	test_shm_path_per_uid_sigint
 	test_lttng_crash