X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fcrash%2Ftest_crash;h=3fa9dbe959bf0381354e93df06f679ffd9170155;hb=8d5a3312b34841f1ecba2605acad3eaca79fd5e4;hp=7570ba9b96864de9eeb43f7707222147d4e0e4ca;hpb=5219e670edb63d5a4b34e095475045e6540f461b;p=lttng-tools.git

diff --git a/tests/regression/tools/crash/test_crash b/tests/regression/tools/crash/test_crash
index 7570ba9b9..3fa9dbe95 100755
--- a/tests/regression/tools/crash/test_crash
+++ b/tests/regression/tools/crash/test_crash
@@ -19,7 +19,7 @@ NR_USEC_WAIT=0
 NR_ITER=-1
 
 # Temp file output
-OUTPUT_DIR=$(mktemp -d --tmpdir tmp.test_crash_shm.XXXXXX)
+OUTPUT_DIR=$(mktemp -d -t tmp.test_crash_shm.XXXXXX)
 
 LAST_APP_PID=
 
@@ -39,7 +39,7 @@ bail_out_if_no_babeltrace
 
 function start_test_app()
 {
-	local tmp_file=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}.XXXXXX")
+	local tmp_file=$(mktemp -u -t "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 &
@@ -95,7 +95,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 --tmpdir "tmp.${FUNCNAME[0]}_shm.XXXXXX")
+	local shm_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_shm.XXXXXX")
 
 	# Build up
 	start_lttng_sessiond
@@ -166,7 +166,7 @@ function test_shm_path_per_uid()
 	local session_name=shm_path_per_uid
 	local channel_name=channel_per_uid
 	set -x
-	local shm_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
+	local shm_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
 	set +x
 
 	# Build up
@@ -218,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 --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
-	local shm_path_symlink=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_shm_path_symlink.XXXXXX")
+	local shm_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
+	local shm_path_symlink=$(mktemp -d -t "tmp.${FUNCNAME[0]}_shm_path_symlink.XXXXXX")
 	local event_name="tp:tptest"
 
 	# Create a session in snapshot mode to deactivate any use of consumerd
@@ -255,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 --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
-	local extraction_dir_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_extraction_dir_path.XXXXXX")
+	local shm_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
+	local extraction_dir_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_extraction_dir_path.XXXXXX")
 	local extraction_path=$extraction_dir_path/extract
 	local event_name="tp:tptest"
 
@@ -289,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 --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
+	local shm_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
 	local num_files=0
 
 	# Build up
@@ -320,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 --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
+	local shm_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
 	local ret=0
 
 	# Build up
@@ -351,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 --tmpdir "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
-	local extraction_dir_path=$(mktemp -d --tmpdir "tmp.${FUNCNAME[0]}_extraction_dir_path.XXXXXX")
+	local shm_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_shm_path.XXXXXX")
+	local extraction_dir_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_extraction_dir_path.XXXXXX")
 	local extraction_path=$extraction_dir_path/extract
 	local event_name="tp:tptest"
 	local ret=0