X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_syscall;h=fd1593d9d6d1751774d3c32c161f1891a898aedc;hp=5e6b7467b284ac130b3f7358d2a604fc226a3e7f;hb=e563bbdb8fa6592790e9ac4e9db7d9decf022023;hpb=8cfcd41c7fac2e14d8f8527238d928bd4ec732fb

diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall
index 5e6b7467b..fd1593d9d 100755
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -20,32 +20,125 @@ TEST_DESC="Kernel tracer - System calls"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
-NUM_TESTS=124
+NUM_TESTS=157
 
 # test command issues at least open and close system calls
 TESTCMD="cat /proc/cpuinfo > /dev/null"
 
 source $TESTDIR/utils/utils.sh
 
+function validate_list()
+{
+	local session_name=$1
+	local event_name=$2
+	local opt=$3
+
+	out=$($TESTDIR/../src/bin/lttng/$LTTNG_BIN list $session_name $opt | grep $event_name)
+	if [ -z "$out" ]; then
+		fail "Validate syscall listing"
+		diag "$event_name not found when listing $session_name (opt $opt)"
+	else
+		pass "Validate syscall listing. Found $event_name."
+	fi
+}
+
+function test_syscall_event_list()
+{
+	local EVENT_NAME="getpid"
+
+	diag "Syscall event listing"
+
+	validate_list "" $EVENT_NAME "-k --syscall"
+}
+
+function test_syscall_simple_list()
+{
+	TRACE_PATH=$(mktemp -d)
+	SESSION_NAME="kernel_syscall_simple_list"
+	local EVENT_NAME="close"
+
+	diag "Syscall simple listing"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+
+	lttng_enable_kernel_syscall_ok $SESSION_NAME $EVENT_NAME
+
+	validate_list $SESSION_NAME $EVENT_NAME
+
+	start_lttng_tracing_ok
+	eval ${TESTCMD}
+	stop_lttng_tracing
+
+	# ensure each is there.
+	validate_trace_exp "-e syscall_entry_$EVENT_NAME: -e compat_syscall_entry_$EVENT_NAME:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_$EVENT_NAME: -e compat_syscall_exit_$EVENT_NAME:" $TRACE_PATH
+
+	# ensure trace only contains those.
+	validate_trace_only_exp "-e syscall_entry_$EVENT_NAME: -e compat_syscall_entry_$EVENT_NAME: -e syscall_exit_$EVENT_NAME: -e compat_syscall_exit_$EVENT_NAME:" $TRACE_PATH
+
+	destroy_lttng_session $SESSION_NAME
+
+	rm -rf $TRACE_PATH
+}
+
+function test_syscall_simple_list_two()
+{
+	TRACE_PATH=$(mktemp -d)
+	SESSION_NAME="kernel_syscall_simple_list_two"
+	local EVENT_NAME="close"
+	local EVENT_NAME2="read"
+
+	diag "Syscall simple listing"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+
+	lttng_enable_kernel_syscall_ok $SESSION_NAME $EVENT_NAME
+	lttng_enable_kernel_syscall_ok $SESSION_NAME $EVENT_NAME2
+
+	validate_list $SESSION_NAME $EVENT_NAME
+	validate_list $SESSION_NAME $EVENT_NAME2
+
+	start_lttng_tracing_ok
+	eval ${TESTCMD}
+	stop_lttng_tracing
+
+	# ensure each is there.
+	validate_trace_exp "-e syscall_entry_$EVENT_NAME: -e compat_syscall_entry_$EVENT_NAME:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_$EVENT_NAME: -e compat_syscall_exit_$EVENT_NAME:" $TRACE_PATH
+
+	# ensure each is there.
+	validate_trace_exp "-e syscall_entry_$EVENT_NAME2: -e compat_syscall_entry_$EVENT_NAME2:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_$EVENT_NAME2: -e compat_syscall_exit_$EVENT_NAME2:" $TRACE_PATH
+
+	# ensure trace only contains those.
+	validate_trace_only_exp "-e syscall_entry_$EVENT_NAME: -e compat_syscall_entry_$EVENT_NAME: -e syscall_exit_$EVENT_NAME: -e compat_syscall_exit_$EVENT_NAME: -e syscall_entry_$EVENT_NAME2: -e compat_syscall_entry_$EVENT_NAME2: -e syscall_exit_$EVENT_NAME2: -e compat_syscall_exit_$EVENT_NAME2:" $TRACE_PATH
+
+	destroy_lttng_session $SESSION_NAME
+
+	rm -rf $TRACE_PATH
+}
+
 function test_syscall_single()
 {
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_single"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace single"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	eval ${TESTCMD}
 	stop_lttng_tracing
 
 	# ensure each is there.
-	validate_trace_exp "-e syscall_entry_open -e compat_syscall_entry_open" $TRACE_PATH
-	validate_trace_exp "-e syscall_exit_open -e compat_syscall_exit_open" $TRACE_PATH
+	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
 
 	# ensure trace only contains those.
-	validate_trace_only_exp "-e syscall_entry_open -e compat_syscall_entry_open -e syscall_exit_open -e compat_syscall_exit_open" $TRACE_PATH
+	validate_trace_only_exp "-e syscall_entry_open: -e compat_syscall_entry_open: -e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
 
 	destroy_lttng_session $SESSION_NAME
 
@@ -57,23 +150,25 @@ function test_syscall_two()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_two"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace two events"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "close"
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	eval ${TESTCMD}
 	stop_lttng_tracing
 
 	# ensure each is there.
-	validate_trace_exp "-e syscall_entry_open -e compat_syscall_entry_open" $TRACE_PATH
-	validate_trace_exp "-e syscall_exit_open -e compat_syscall_exit_open" $TRACE_PATH
-	validate_trace_exp "-e syscall_entry_close -e compat_syscall_entry_close" $TRACE_PATH
-	validate_trace_exp "-e syscall_exit_close -e compat_syscall_exit_close" $TRACE_PATH
+	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
+	validate_trace_exp "-e syscall_entry_close: -e compat_syscall_entry_close:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 
 	# ensure trace only contains those.
-	validate_trace_only_exp "-e syscall_entry_open -e compat_syscall_entry_open -e syscall_exit_open -e compat_syscall_exit_open -e syscall_entry_close -e compat_syscall_entry_close -e syscall_exit_close -e compat_syscall_exit_close" $TRACE_PATH
+	validate_trace_only_exp "-e syscall_entry_open: -e compat_syscall_entry_open: -e syscall_exit_open: -e compat_syscall_exit_open: -e syscall_entry_close: -e compat_syscall_entry_close: -e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 
 	destroy_lttng_session $SESSION_NAME
 
@@ -85,20 +180,22 @@ function test_syscall_all()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_all"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace all events"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable all syscalls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	eval ${TESTCMD}
 	stop_lttng_tracing
 
 	# ensure at least open and close are there.
-	validate_trace_exp "-e syscall_entry_open -e compat_syscall_entry_open" $TRACE_PATH
-	validate_trace_exp "-e syscall_exit_open -e compat_syscall_exit_open" $TRACE_PATH
-	validate_trace_exp "-e syscall_entry_close -e compat_syscall_entry_close" $TRACE_PATH
-	validate_trace_exp "-e syscall_exit_close -e compat_syscall_exit_close" $TRACE_PATH
+	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
+	validate_trace_exp "-e syscall_entry_close: -e compat_syscall_entry_close:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 	# trace may contain other syscalls.
 
 	destroy_lttng_session $SESSION_NAME
@@ -111,23 +208,26 @@ function test_syscall_all_disable_one()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_all_disable_one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace all events and disable one"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable all syscalls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
-	# disable open system call
-	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
+	# try to disable open system call: fails because enabler semantic of
+	# "all syscalls" is not "the open" system call.
+	lttng_disable_kernel_syscall_fail $SESSION_NAME "open"
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	eval ${TESTCMD}
 	stop_lttng_tracing
 
-	# ensure "open" syscall is not there.
-	validate_trace_only_exp "-v -e syscall_entry_open -e compat_syscall_entry_open -e syscall_exit_open -e compat_syscall_exit_open" $TRACE_PATH
+	# ensure "open" syscall is there.
+	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open: -e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
 
 	# ensure "close" syscall is there.
-	validate_trace_exp "-e syscall_entry_close -e compat_syscall_entry_close" $TRACE_PATH
-	validate_trace_exp "-e syscall_exit_close -e compat_syscall_exit_close" $TRACE_PATH
+	validate_trace_exp "-e syscall_entry_close: -e compat_syscall_entry_close:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 
 	destroy_lttng_session $SESSION_NAME
 
@@ -139,25 +239,32 @@ function test_syscall_all_disable_two()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_all_disable_two"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace all events and disable two"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable all syscalls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
-	# disable open system call
-	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
-	lttng_disable_kernel_syscall_ok $SESSION_NAME "close"
+	# try to disable open and close system calls: fails because enabler
+	# semantic of "all syscalls" is not "the open" system call.
+	lttng_disable_kernel_syscall_fail $SESSION_NAME "open"
+	lttng_disable_kernel_syscall_fail $SESSION_NAME "close"
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
 	stop_lttng_tracing
 
-	# ensure "open" and "close" syscalls are not there.
-	validate_trace_only_exp "-v -e syscall_entry_open -e compat_syscall_entry_open -e syscall_exit_open -e compat_syscall_exit_open -e syscall_entry_close -e compat_syscall_entry_close -e syscall_exit_close -e compat_syscall_exit_close" $TRACE_PATH
+	# ensure "open" syscall is there.
+	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open: -e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
+
+	# ensure "close" syscall is there.
+	validate_trace_exp "-e syscall_entry_close: -e compat_syscall_entry_close:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 
 	# ensure "execve" syscall is there.
-	validate_trace_exp "-e syscall_entry_execve -e compat_syscall_entry_execve" $TRACE_PATH
-	validate_trace_exp "-e syscall_exit_execve -e compat_syscall_exit_execve" $TRACE_PATH
+	validate_trace_exp "-e syscall_entry_execve: -e compat_syscall_entry_execve:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_execve: -e compat_syscall_exit_execve:" $TRACE_PATH
 
 	destroy_lttng_session $SESSION_NAME
 
@@ -169,14 +276,16 @@ function test_syscall_enable_all_disable_all()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_all_disable_all"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace all events and disable all"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable all system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
 	# disable all system calls
 	lttng_disable_kernel_syscall_ok $SESSION_NAME
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
 	stop_lttng_tracing
@@ -194,7 +303,9 @@ function test_syscall_enable_all_disable_all_enable_all()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_all_disable_all_enable_all"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace all events and enable/disable all"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable all system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
@@ -203,16 +314,16 @@ function test_syscall_enable_all_disable_all_enable_all()
 	# enable all system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
 	stop_lttng_tracing
 
 	# ensure at least open and close are there.
-	validate_trace_exp "-e syscall_entry_open -e compat_syscall_entry_open" $TRACE_PATH
-	validate_trace_exp "-e syscall_exit_open -e compat_syscall_exit_open" $TRACE_PATH
-	validate_trace_exp "-e syscall_entry_close -e compat_syscall_entry_close" $TRACE_PATH
-	validate_trace_exp "-e syscall_exit_close -e compat_syscall_exit_close" $TRACE_PATH
+	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
+	validate_trace_exp "-e syscall_entry_close: -e compat_syscall_entry_close:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 	# trace may contain other syscalls.
 
 	destroy_lttng_session $SESSION_NAME
@@ -225,7 +336,9 @@ function test_syscall_enable_all_disable_all_twice()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_all_disable_all_twice"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace all events and enable/disable all twice"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable all system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
@@ -236,7 +349,7 @@ function test_syscall_enable_all_disable_all_twice()
 	# disable all system calls
 	lttng_disable_kernel_syscall_ok $SESSION_NAME
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
 	stop_lttng_tracing
@@ -254,14 +367,16 @@ function test_syscall_enable_one_disable_one()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_one_disable_one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace one event and disable one"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable open system call
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
 	# disable open system call
 	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
 	stop_lttng_tracing
@@ -279,7 +394,9 @@ function test_syscall_enable_two_disable_two()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_two_disable_two"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace two events and disable two"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable open and close system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
@@ -288,7 +405,7 @@ function test_syscall_enable_two_disable_two()
 	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
 	lttng_disable_kernel_syscall_ok $SESSION_NAME "close"
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
 	stop_lttng_tracing
@@ -306,7 +423,9 @@ function test_syscall_enable_two_disable_one()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_two_disable_one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace two events and disable one"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable open and close system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
@@ -314,17 +433,17 @@ function test_syscall_enable_two_disable_one()
 	# disable close system call
 	lttng_disable_kernel_syscall_ok $SESSION_NAME "close"
 
-	start_lttng_tracing
+	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
 	stop_lttng_tracing
 
 	# ensure open is there.
-	validate_trace_exp "-e syscall_entry_open -e compat_syscall_entry_open" $TRACE_PATH
-	validate_trace_exp "-e syscall_exit_open -e compat_syscall_exit_open" $TRACE_PATH
+	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
 
 	# ensure trace only contains those.
-	validate_trace_only_exp "-e syscall_entry_open -e compat_syscall_entry_open -e syscall_exit_open -e compat_syscall_exit_open" $TRACE_PATH
+	validate_trace_only_exp "-e syscall_entry_open: -e compat_syscall_entry_open: -e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
 
 	destroy_lttng_session $SESSION_NAME
 
@@ -336,13 +455,15 @@ function test_syscall_disable_twice()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_disable_twice"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace one event and disable twice"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
 	# First disable will succeed
 	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
-	# Second disable will fail
-	lttng_disable_kernel_syscall_fail $SESSION_NAME "open"
+	# Second disable succeeds too, due to enabler semantic.
+	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
 
 	destroy_lttng_session $SESSION_NAME
 
@@ -354,13 +475,15 @@ function test_syscall_disable_all_twice()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_disable_all_twice"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall trace all events and disable all twice"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
 	# First disable will succeed
 	lttng_disable_kernel_syscall_ok $SESSION_NAME
-	# Second disable will fail
-	lttng_disable_kernel_syscall_fail $SESSION_NAME
+	# Second disable succeeds too, due to enabler semantic.
+	lttng_disable_kernel_syscall_ok $SESSION_NAME
 
 	destroy_lttng_session $SESSION_NAME
 
@@ -373,9 +496,13 @@ function test_syscall_enable_unknown()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_unknown"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall enable an unknown event"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
-	lttng_enable_kernel_syscall_fail $SESSION_NAME "thissyscallcannotexist"
+	# Enabling a syscall that does not exist succeeds, due to enabler
+	# semantic.
+	lttng_enable_kernel_syscall_ok $SESSION_NAME "thissyscallcannotexist"
 
 	destroy_lttng_session $SESSION_NAME
 
@@ -387,11 +514,13 @@ function test_syscall_enable_all_enable_one()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_all_enable_one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall enable all and enable one"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
-	# Enabling an event already enabled fails.
-	lttng_enable_kernel_syscall_fail $SESSION_NAME "open"
+	# Enabling an event already enabled succeeds, due to enabler semantic.
+	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
 
 	destroy_lttng_session $SESSION_NAME
 
@@ -403,7 +532,9 @@ function test_syscall_disable_all_disable_one()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_all_enable_one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	diag "Syscall disable all and disable one"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
 	lttng_disable_kernel_syscall_ok $SESSION_NAME
@@ -415,6 +546,44 @@ function test_syscall_disable_all_disable_one()
 	rm -rf $TRACE_PATH
 }
 
+function test_syscall_enable_channel_disable_all()
+{
+	TRACE_PATH=$(mktemp -d)
+	SESSION_NAME="kernel_syscall_enable_channel_disable_all"
+	CHANNEL_NAME="channel"
+
+	diag "Syscall enable channel and disable all"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+
+	lttng_enable_kernel_channel_ok $SESSION_NAME $CHANNEL_NAME
+	# sessiond semantic for "disable all" is to try to match all enalers
+	# it knowns about. Disable all succeeds if it finds no match.
+	lttng_disable_kernel_syscall_ok $SESSION_NAME "-a" $CHANNEL_NAME
+
+	destroy_lttng_session $SESSION_NAME
+
+	rm -rf $TRACE_PATH
+}
+
+function test_syscall_enable_channel_disable_one()
+{
+	TRACE_PATH=$(mktemp -d)
+	SESSION_NAME="kernel_syscall_enable_channel_disable_all"
+	CHANNEL_NAME="channel"
+
+	diag "Syscall enable channel and disable one"
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+
+	lttng_enable_kernel_channel_ok $SESSION_NAME $CHANNEL_NAME
+	lttng_disable_kernel_syscall_fail $SESSION_NAME "open" $CHANNEL_NAME
+
+	destroy_lttng_session $SESSION_NAME
+
+	rm -rf $TRACE_PATH
+}
+
 # MUST set TESTDIR before calling those functions
 plan_tests $NUM_TESTS
 
@@ -430,6 +599,9 @@ skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 {
 	start_lttng_sessiond
 
+	test_syscall_event_list
+	test_syscall_simple_list
+	test_syscall_simple_list_two
 	test_syscall_single
 	test_syscall_two
 	test_syscall_all
@@ -446,6 +618,8 @@ skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 	test_syscall_enable_unknown
 	test_syscall_enable_all_enable_one
 	test_syscall_disable_all_disable_one
+	test_syscall_enable_channel_disable_all
+	test_syscall_enable_channel_disable_one
 
 	stop_lttng_sessiond
 }