X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_syscall;h=9fe599a1595e0b14ffa2fdfb20ba6efef4cf1453;hp=16df6a895f930f30764ee8f20d5c7ac8f9c152a1;hb=bf6ae429bc7bf2fefdce61e48806768dab7567d5;hpb=02db71bac53b6537d8774df68c8a39a807a39b93

diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall
index 16df6a895..9fe599a15 100755
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -20,7 +20,7 @@ TEST_DESC="Kernel tracer - System calls"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
-NUM_TESTS=155
+NUM_TESTS=157
 
 # test command issues at least open and close system calls
 TESTCMD="cat /proc/cpuinfo > /dev/null"
@@ -59,7 +59,7 @@ function test_syscall_simple_list()
 
 	diag "Syscall simple listing"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME $EVENT_NAME
 
@@ -90,7 +90,7 @@ function test_syscall_simple_list_two()
 
 	diag "Syscall simple listing"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	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
@@ -125,7 +125,7 @@ function test_syscall_single()
 
 	diag "Syscall trace single"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
 
@@ -152,7 +152,7 @@ function test_syscall_two()
 
 	diag "Syscall trace two events"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "close"
@@ -182,7 +182,7 @@ function test_syscall_all()
 
 	diag "Syscall trace all events"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable all syscalls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
@@ -210,19 +210,20 @@ function test_syscall_all_disable_one()
 
 	diag "Syscall trace all events and disable one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	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
 	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
@@ -240,21 +241,26 @@ function test_syscall_all_disable_two()
 
 	diag "Syscall trace all events and disable two"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	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
 	# 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
@@ -272,7 +278,7 @@ function test_syscall_enable_all_disable_all()
 
 	diag "Syscall trace all events and disable all"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable all system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
@@ -299,7 +305,7 @@ function test_syscall_enable_all_disable_all_enable_all()
 
 	diag "Syscall trace all events and enable/disable all"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable all system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
@@ -332,7 +338,7 @@ function test_syscall_enable_all_disable_all_twice()
 
 	diag "Syscall trace all events and enable/disable all twice"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable all system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
@@ -363,7 +369,7 @@ function test_syscall_enable_one_disable_one()
 
 	diag "Syscall trace one event and disable one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable open system call
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
@@ -390,7 +396,7 @@ function test_syscall_enable_two_disable_two()
 
 	diag "Syscall trace two events and disable two"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable open and close system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
@@ -419,7 +425,7 @@ function test_syscall_enable_two_disable_one()
 
 	diag "Syscall trace two events and disable one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable open and close system calls
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
@@ -451,13 +457,13 @@ function test_syscall_disable_twice()
 
 	diag "Syscall trace one event and disable twice"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	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
 
@@ -471,13 +477,13 @@ function test_syscall_disable_all_twice()
 
 	diag "Syscall trace all events and disable all twice"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	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
 
@@ -492,9 +498,11 @@ function test_syscall_enable_unknown()
 
 	diag "Syscall enable an unknown event"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	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
 
@@ -508,11 +516,11 @@ function test_syscall_enable_all_enable_one()
 
 	diag "Syscall enable all and enable one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	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
 
@@ -526,7 +534,7 @@ function test_syscall_disable_all_disable_one()
 
 	diag "Syscall disable all and disable one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
 	lttng_disable_kernel_syscall_ok $SESSION_NAME
@@ -546,10 +554,12 @@ function test_syscall_enable_channel_disable_all()
 
 	diag "Syscall enable channel and disable all"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_channel_ok $SESSION_NAME $CHANNEL_NAME
-	lttng_disable_kernel_syscall_fail $SESSION_NAME "-a" $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
 
@@ -564,7 +574,7 @@ function test_syscall_enable_channel_disable_one()
 
 	diag "Syscall enable channel and disable one"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	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