X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_callstack;h=b5759d442d1670f158e01ec4603eca4a884cd13a;hb=33e557114a2ba28e26e220a833e8a449c78b8b65;hp=c4a6200dae0351e2ad86ee727d11631fec0f28fb;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_callstack b/tests/regression/kernel/test_callstack
index c4a6200da..b5759d442 100755
--- a/tests/regression/kernel/test_callstack
+++ b/tests/regression/kernel/test_callstack
@@ -33,12 +33,14 @@ function lttng_track_pid()
 function run_workload()
 {
 	local TEST_APP=$1
-	local start_file_sync
-	start_file_sync=$(mktemp -u)
+	# shift the first argument, passing along the other args if any to the
+	# test app.
+	shift
+	local start_file_sync=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_first.XXXXXX")
 
 	lttng_untrack_all
 
-	./"$TEST_APP" "$start_file_sync" &
+	./"$TEST_APP" "$start_file_sync" "$@" &
 	PID=$!
 	lttng_track_pid $PID
 
@@ -58,7 +60,7 @@ function run_workload()
 
 function test_user_callstack()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	# This is the expected userspace callstack. (see gen-syscall-events-callstack.c)
 	USER_CS_EXPECTED="main fct_a fct_b fct_c my_gettid"
 	EVENT_NAME="gettid"
@@ -82,7 +84,7 @@ function test_user_callstack()
 
 function test_kernel_callstack()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	# Those are symbol expected to be present in the kernel callstack. This
 	# is not an exhaustive list since it's kernel dependent.
 
@@ -108,7 +110,7 @@ function test_kernel_callstack()
 	lttng_enable_kernel_syscall_ok "$SESSION_NAME" "$EVENT_NAME" "$CHANNEL_NAME"
 	add_context_kernel_ok "$SESSION_NAME" "$CHANNEL_NAME" "callstack-kernel"
 
-	run_workload $TEST_APP_KERNELSPACE
+	run_workload "$TEST_APP_KERNELSPACE" "/proc/cpuinfo" "/proc/cmdline"
 
 	destroy_lttng_session_ok "$SESSION_NAME"