X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_load;h=e073e6071aabad107dc5d05c90d4348795bf9ccf;hb=c661f2f4c022314efcdc76b18f084cb42275370b;hp=7899cc09ba71c9955f8912a87c7b7e3986f4edcc;hpb=fa182fe058682b855a353931e5ef1994325c3da3;p=lttng-tools.git

diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index 7899cc09b..e073e6071 100755
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -9,7 +9,7 @@ TEST_DESC="Load session(s)"
 CURDIR=$(dirname $0)/
 CONFIG_DIR="${CURDIR}/configuration"
 TESTDIR=$CURDIR/../../../
-export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/)
+export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/)
 
 SESSION_NAME="load-42"
 EVENT_NAME="tp:tptest"
@@ -58,7 +58,7 @@ function test_complex_load()
 	disable_ust_lttng_channel $sess chan3
 
 	# Confirm that an event stored as disabled is restored in its disabled state
-	local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+	local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
 	if [ $? -ne 0 ]; then
 		break;
 	fi
@@ -127,7 +127,7 @@ function test_trackers()
 	lttng_load_ok "-i $CURDIR/$SESSION_NAME-trackers.lttng"
 
 	diag "Test pid tracker"
-	local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+	local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
 	if [ $? -ne 0 ]; then
 		break;
 	fi
@@ -168,7 +168,7 @@ function test_override_url_normal()
 {
 	local local_url_override="file:///tmp/override/to/here"
 	local local_path_override="/tmp/override/to/here"
-	local local_path_compare_value="/tmp/override/to/here/"
+	local local_path_compare_value="/tmp/override/to/here"
 	local stream_url_override="net://127.0.0.1:8172:9817"
 	local stream_url_compare="tcp4://127.0.0.1:8172/ [data: 9817]"
 
@@ -176,7 +176,7 @@ function test_override_url_normal()
 
 	start_lttng_relayd "-C tcp://127.0.0.1:8172 -D tcp://127.0.0.1:9817"
 
-	local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+	local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
 	if [ $? -ne 0 ]; then
 		break;
 	fi
@@ -216,7 +216,7 @@ function test_override_url_snapshot()
 {
 	local url_override="file:///tmp/override/to/here"
 	local path_override="/tmp/override/to/here"
-	local path_compare_value="/tmp/override/to/here/"
+	local path_compare_value="/tmp/override/to/here"
 	local stream_url_override="net://127.0.0.1:8172:9817"
 	local stream_url_compare_ctrl="tcp4://127.0.0.1:8172/"
 	local stream_url_compare_data="tcp4://127.0.0.1:9817/"
@@ -226,7 +226,7 @@ function test_override_url_snapshot()
 
 	start_lttng_relayd "-C tcp://127.0.0.1:8172 -D tcp://127.0.0.1:9817"
 
-	local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+	local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
 	if [ $? -ne 0 ]; then
 		break;
 	fi
@@ -271,7 +271,7 @@ function test_override_url_live()
 {
 	local url_override="file:///tmp/override/to/here"
 	local path_override="/tmp/override/to/here"
-	local path_compare_value="/tmp/override/to/here/"
+	local path_compare_value="/tmp/override/to/here"
 	local stream_url_override="net://127.0.0.1:8172:9817"
 	local stream_url_compare="tcp4://127.0.0.1:8172/ [data: 9817]"
 	local local_session_name="${SESSION_NAME}-live"
@@ -280,7 +280,7 @@ function test_override_url_live()
 
 	start_lttng_relayd "-C tcp://127.0.0.1:8172 -D tcp://127.0.0.1:9817"
 
-	local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+	local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
 	if [ $? -ne 0 ]; then
 		break;
 	fi
@@ -316,7 +316,7 @@ function test_override_session_name()
 	local override_name="PinkyAndTheBrain"
 	local output_path="/tmp/lttng/load-42-1"
 
-	local mi_output_file=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
+	local mi_output_file=$(mktemp -t "tmp.${FUNCNAME[0]}_output_file.XXXXXX")
 	if [ $? -ne 0 ]; then
 		break;
 	fi
@@ -362,7 +362,7 @@ TESTS=(
 
 for fct_test in ${TESTS[@]};
 do
-	TRACE_PATH=$(mktemp --tmpdir -d tmp.test_load_trace_path.XXXXXX)
+	TRACE_PATH=$(mktemp -d -t tmp.test_load_trace_path.XXXXXX)
 
 	${fct_test}
 	if [ $? -ne 0 ]; then