X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_syscall;h=f9b49085835b39b2fc109b53b8ff61998e0710ed;hb=f38b11e104c2f6e916f83617f14e643e73ca917b;hp=9ce40dcc52bf5fc84ae7643090169d87630552ec;hpb=0ee507ec0bd8168219e400cb5622931d86ac0c62;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall
index 9ce40dcc5..f9b490858 100755
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -20,14 +20,13 @@ source $TESTDIR/utils/utils.sh
 
 function trace_testapp()
 {
-	local start_file_sync
-	start_file_sync=$(mktemp -u)
+	local start_file_sync=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_start.XXXXXX")
 
 	# Clear all entries from the resource tracker
 	lttng_untrack_kernel_all_ok
 
 	# Launch the testapp and save its Process ID
-	./"$TESTCMD" "$start_file_sync" &
+	./"$TESTCMD" "$start_file_sync" "/proc/cpuinfo" "/proc/cmdline" &
 	PID=$!
 
 	# Set LTTng to track this PID and start the tracing
@@ -73,7 +72,7 @@ function test_syscall_event_list()
 
 function test_syscall_simple_list()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_simple_list"
 	local EVENT_NAME="close"
 
@@ -101,7 +100,7 @@ function test_syscall_simple_list()
 
 function test_syscall_simple_list_two()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_simple_list_two"
 	local EVENT_NAME="close"
 	local EVENT_NAME2="read"
@@ -135,7 +134,7 @@ function test_syscall_simple_list_two()
 
 function test_syscall_single()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_single"
 
 	diag "Syscall trace single"
@@ -160,7 +159,7 @@ function test_syscall_single()
 
 function test_syscall_two()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_two"
 
 	diag "Syscall trace two events"
@@ -188,7 +187,7 @@ function test_syscall_two()
 
 function test_syscall_all()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_all"
 
 	diag "Syscall trace all events"
@@ -214,7 +213,7 @@ function test_syscall_all()
 
 function test_syscall_all_disable_one()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_all_disable_one"
 
 	diag "Syscall trace all events and disable one"
@@ -243,7 +242,7 @@ function test_syscall_all_disable_one()
 
 function test_syscall_all_disable_two()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_all_disable_two"
 
 	diag "Syscall trace all events and disable two"
@@ -277,7 +276,7 @@ function test_syscall_all_disable_two()
 
 function test_syscall_enable_all_disable_all()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_all_disable_all"
 
 	diag "Syscall trace all events and disable all"
@@ -301,7 +300,7 @@ function test_syscall_enable_all_disable_all()
 
 function test_syscall_enable_all_disable_all_enable_all()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_all_disable_all_enable_all"
 
 	diag "Syscall trace all events and enable/disable all"
@@ -331,7 +330,7 @@ function test_syscall_enable_all_disable_all_enable_all()
 
 function test_syscall_enable_all_enable_one_disable_all()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_all_enable_one_disable_all"
 
 	diag "Syscall trace all events, enable one and disable all"
@@ -360,7 +359,7 @@ function test_syscall_enable_all_enable_one_disable_all()
 
 function test_syscall_enable_one_enable_all_disable_one()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_one_enable_all_disable_one"
 
 	diag "Syscall trace all events and enable/disable one"
@@ -389,7 +388,7 @@ function test_syscall_enable_one_enable_all_disable_one()
 
 function test_syscall_enable_one_enable_all_disable_all_disable_one()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_one_enable_all_disable_all_disable_one"
 
 	diag "Syscall trace all events and enable/disable one"
@@ -421,7 +420,7 @@ function test_syscall_enable_one_enable_all_disable_all_disable_one()
 
 function test_syscall_enable_all_disable_all_twice()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_all_disable_all_twice"
 
 	diag "Syscall trace all events and enable/disable all twice"
@@ -449,7 +448,7 @@ function test_syscall_enable_all_disable_all_twice()
 
 function test_syscall_enable_one_disable_one()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_one_disable_one"
 
 	diag "Syscall trace one event and disable one"
@@ -473,7 +472,7 @@ function test_syscall_enable_one_disable_one()
 
 function test_syscall_enable_two_disable_two()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_two_disable_two"
 
 	diag "Syscall trace two events and disable two"
@@ -499,7 +498,7 @@ function test_syscall_enable_two_disable_two()
 
 function test_syscall_enable_two_disable_one()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_two_disable_one"
 
 	diag "Syscall trace two events and disable one"
@@ -528,7 +527,7 @@ function test_syscall_enable_two_disable_one()
 
 function test_syscall_disable_twice()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_disable_twice"
 
 	diag "Syscall trace one event and disable twice"
@@ -548,7 +547,7 @@ function test_syscall_disable_twice()
 
 function test_syscall_disable_all_twice()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_disable_all_twice"
 
 	diag "Syscall trace all events and disable all twice"
@@ -569,7 +568,7 @@ function test_syscall_disable_all_twice()
 
 function test_syscall_enable_unknown()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_unknown"
 
 	diag "Syscall enable an unknown event"
@@ -587,7 +586,7 @@ function test_syscall_enable_unknown()
 
 function test_syscall_enable_all_enable_one()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_all_enable_one"
 
 	diag "Syscall enable all and enable one"
@@ -605,7 +604,7 @@ function test_syscall_enable_all_enable_one()
 
 function test_syscall_disable_all_disable_one()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_all_enable_one"
 
 	diag "Syscall disable all and disable one"
@@ -624,7 +623,7 @@ function test_syscall_disable_all_disable_one()
 
 function test_syscall_enable_channel_disable_all()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_channel_disable_all"
 	CHANNEL_NAME="channel"
 
@@ -644,7 +643,7 @@ function test_syscall_enable_channel_disable_all()
 
 function test_syscall_enable_channel_disable_one()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_channel_disable_all"
 	CHANNEL_NAME="channel"
 
@@ -673,6 +672,7 @@ fi
 
 skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 {
+	validate_lttng_modules_present
 	start_lttng_sessiond
 
 	test_syscall_event_list