X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-log4j%2Ftest_java_log4j;h=ed4302879e5ac183f3de1b2e2d987773846e3ce1;hb=4ae042345b4094e98611744d9ba6c92265058fdb;hp=8b045025b0f1d0f8e463116e36bfed899c98bd99;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/ust/java-log4j/test_java_log4j b/tests/regression/ust/java-log4j/test_java_log4j
index 8b045025b..ed4302879 100755
--- a/tests/regression/ust/java-log4j/test_java_log4j
+++ b/tests/regression/ust/java-log4j/test_java_log4j
@@ -80,8 +80,8 @@ function enable_log4j_filter_loglevel_only()
 
 function test_log4j_before_start ()
 {
-	local file_sync_after_first=$(mktemp -u)
-	local file_sync_before_last=$(mktemp -u)
+	local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
 	diag "Test LOG4J application BEFORE tracing starts"
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -661,6 +661,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 if [ ! -f "$TESTAPP_PATH.class" ]; then
 	withapp=0
 else
@@ -693,7 +695,7 @@ skip $withapp "LOG4J support is needed. Skipping all tests." $NUM_TESTS ||
 
 	for fct_test in ${tests[@]};
 	do
-		TRACE_PATH=$(mktemp -d)
+		TRACE_PATH=$(mktemp --tmpdir -d tmp.test_java_log4j_trace_path.XXXXXX)
 
 		${fct_test}
 		if [ $? -ne 0 ]; then