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

diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall
index 487ee668e..b193dfb88 100755
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -10,7 +10,7 @@ TEST_DESC="Kernel tracer - System calls"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
-NUM_TESTS=183
+NUM_TESTS=214
 
 # `gen-syscall-event` starts and waits for the creation a file passed by
 # arguments to start executing 3 syscalls (open,read,close) and returning.
@@ -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 --tmpdir -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 --tmpdir -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 --tmpdir -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 --tmpdir -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 --tmpdir -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 --tmpdir -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 --tmpdir -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 --tmpdir -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 --tmpdir -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 --tmpdir -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"
@@ -329,9 +328,99 @@ function test_syscall_enable_all_disable_all_enable_all()
 	rm -rf $TRACE_PATH
 }
 
+function test_syscall_enable_all_enable_one_disable_all()
+{
+	local TRACE_PATH=$(mktemp --tmpdir -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"
+
+	create_lttng_session_ok $SESSION_NAME "$TRACE_PATH"
+
+	# enable all syscalls
+	lttng_enable_kernel_syscall_ok $SESSION_NAME
+
+	# enable one specific syscall, "openat"
+	lttng_enable_kernel_syscall_ok $SESSION_NAME openat
+
+	# disable all syscalls
+	lttng_disable_kernel_syscall_ok $SESSION_NAME
+
+	trace_testapp
+
+	# The trace shouldn't contain any syscalls, disable-all should disable
+	# even individually specified syscalls
+	trace_match_only openat 0 "$TRACE_PATH"
+
+	destroy_lttng_session_ok $SESSION_NAME
+
+	rm -rf "$TRACE_PATH"
+}
+
+function test_syscall_enable_one_enable_all_disable_one()
+{
+	local TRACE_PATH=$(mktemp --tmpdir -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"
+
+	create_lttng_session_ok $SESSION_NAME "$TRACE_PATH"
+
+	# enable one specific syscall, "openat"
+	lttng_enable_kernel_syscall_ok $SESSION_NAME openat
+
+	# enable all syscalls
+	lttng_enable_kernel_syscall_ok $SESSION_NAME
+
+	# disable one specific syscall, "openat"
+	lttng_disable_kernel_syscall_ok $SESSION_NAME openat
+
+	trace_testapp
+
+	# The trace should contain all syscalls, including 'openat' because
+	# enable-all overrides individually disabled syscalls.
+	validate_trace openat "$TRACE_PATH"
+
+	destroy_lttng_session_ok $SESSION_NAME
+
+	rm -rf "$TRACE_PATH"
+}
+
+function test_syscall_enable_one_enable_all_disable_all_disable_one()
+{
+	local TRACE_PATH=$(mktemp --tmpdir -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"
+
+	create_lttng_session_ok $SESSION_NAME "$TRACE_PATH"
+
+	# enable one specific syscall, "openat"
+	lttng_enable_kernel_syscall_ok $SESSION_NAME openat
+
+	# enable all syscalls
+	lttng_enable_kernel_syscall_ok $SESSION_NAME
+
+	# disable all syscalls
+	lttng_disable_kernel_syscall_ok $SESSION_NAME
+
+	# disable one specific syscall, "openat"
+	lttng_disable_kernel_syscall_ok $SESSION_NAME openat
+
+	trace_testapp
+
+	# The trace shouldn't contain any syscalls, disable-all should disable
+	# even individually specified syscalls
+	trace_match_only openat 0 "$TRACE_PATH"
+
+	destroy_lttng_session_ok $SESSION_NAME
+
+	rm -rf "$TRACE_PATH"
+}
+
 function test_syscall_enable_all_disable_all_twice()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp --tmpdir -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"
@@ -359,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 --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_one_disable_one"
 
 	diag "Syscall trace one event and disable one"
@@ -383,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 --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_two_disable_two"
 
 	diag "Syscall trace two events and disable two"
@@ -409,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 --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_two_disable_one"
 
 	diag "Syscall trace two events and disable one"
@@ -438,7 +527,7 @@ function test_syscall_enable_two_disable_one()
 
 function test_syscall_disable_twice()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_disable_twice"
 
 	diag "Syscall trace one event and disable twice"
@@ -458,7 +547,7 @@ function test_syscall_disable_twice()
 
 function test_syscall_disable_all_twice()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_disable_all_twice"
 
 	diag "Syscall trace all events and disable all twice"
@@ -479,7 +568,7 @@ function test_syscall_disable_all_twice()
 
 function test_syscall_enable_unknown()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_unknown"
 
 	diag "Syscall enable an unknown event"
@@ -497,7 +586,7 @@ function test_syscall_enable_unknown()
 
 function test_syscall_enable_all_enable_one()
 {
-	TRACE_PATH=$(mktemp -d)
+	local TRACE_PATH=$(mktemp --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_all_enable_one"
 
 	diag "Syscall enable all and enable one"
@@ -515,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 --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_all_enable_one"
 
 	diag "Syscall disable all and disable one"
@@ -534,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 --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_channel_disable_all"
 	CHANNEL_NAME="channel"
 
@@ -554,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 --tmpdir -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="kernel_syscall_enable_channel_disable_all"
 	CHANNEL_NAME="channel"
 
@@ -596,6 +685,9 @@ skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 	test_syscall_enable_all_disable_all
 	test_syscall_enable_all_disable_all_enable_all
 	test_syscall_enable_all_disable_all_twice
+	test_syscall_enable_all_enable_one_disable_all
+	test_syscall_enable_one_enable_all_disable_one
+	test_syscall_enable_one_enable_all_disable_all_disable_one
 	test_syscall_enable_one_disable_one
 	test_syscall_enable_two_disable_two
 	test_syscall_enable_two_disable_one