X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_syscall;h=e3b29e8197b59a248384b420997470aae2279d0b;hb=ea75976abd0ccf78161987eede3c0ed59df2f209;hp=657c5eea26629692f88dff96171e102fc8051858;hpb=d96f6315f068984c2edda2ac612bacbdb2c7b0d2;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall
index 657c5eea2..e3b29e819 100755
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -32,6 +32,8 @@ function test_syscall_single()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_single"
 
+	diag "Syscall trace single"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
@@ -41,11 +43,11 @@ function test_syscall_single()
 	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,6 +59,8 @@ function test_syscall_two()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_two"
 
+	diag "Syscall trace two events"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
@@ -67,13 +71,13 @@ function test_syscall_two()
 	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,6 +89,8 @@ function test_syscall_all()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_all"
 
+	diag "Syscall trace all events"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	# enable all syscalls
@@ -95,10 +101,10 @@ function test_syscall_all()
 	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,6 +117,8 @@ function test_syscall_all_disable_one()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_all_disable_one"
 
+	diag "Syscall trace all events and disable one"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	# enable all syscalls
@@ -123,11 +131,11 @@ function test_syscall_all_disable_one()
 	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
+	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 "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,6 +147,8 @@ function test_syscall_all_disable_two()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_all_disable_two"
 
+	diag "Syscall trace all events and disable two"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	# enable all syscalls
@@ -153,11 +163,11 @@ function test_syscall_all_disable_two()
 	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
+	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 "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,6 +179,8 @@ function test_syscall_enable_all_disable_all()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_all_disable_all"
 
+	diag "Syscall trace all events and disable all"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	# enable all system calls
@@ -194,6 +206,8 @@ function test_syscall_enable_all_disable_all_enable_all()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_all_disable_all_enable_all"
 
+	diag "Syscall trace all events and enable/disable all"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	# enable all system calls
@@ -209,10 +223,10 @@ function test_syscall_enable_all_disable_all_enable_all()
 	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,6 +239,8 @@ function test_syscall_enable_all_disable_all_twice()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_all_disable_all_twice"
 
+	diag "Syscall trace all events and enable/disable all twice"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	# enable all system calls
@@ -254,6 +270,8 @@ function test_syscall_enable_one_disable_one()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_one_disable_one"
 
+	diag "Syscall trace one event and disable one"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	# enable open system call
@@ -279,6 +297,8 @@ function test_syscall_enable_two_disable_two()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_two_disable_two"
 
+	diag "Syscall trace two events and disable two"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	# enable open and close system calls
@@ -306,6 +326,8 @@ function test_syscall_enable_two_disable_one()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_two_disable_one"
 
+	diag "Syscall trace two events and disable one"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	# enable open and close system calls
@@ -320,11 +342,11 @@ function test_syscall_enable_two_disable_one()
 	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,6 +358,8 @@ function test_syscall_disable_twice()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_disable_twice"
 
+	diag "Syscall trace one event and disable twice"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
@@ -354,6 +378,8 @@ function test_syscall_disable_all_twice()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_disable_all_twice"
 
+	diag "Syscall trace all events and disable all twice"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
@@ -373,6 +399,8 @@ function test_syscall_enable_unknown()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_unknown"
 
+	diag "Syscall enable an unknown event"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_fail $SESSION_NAME "thissyscallcannotexist"
@@ -387,6 +415,8 @@ function test_syscall_enable_all_enable_one()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_all_enable_one"
 
+	diag "Syscall enable all and enable one"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
@@ -403,6 +433,8 @@ function test_syscall_disable_all_disable_one()
 	TRACE_PATH=$(mktemp -d)
 	SESSION_NAME="kernel_syscall_enable_all_enable_one"
 
+	diag "Syscall disable all and disable one"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
@@ -421,6 +453,8 @@ function test_syscall_enable_channel_disable_all()
 	SESSION_NAME="kernel_syscall_enable_channel_disable_all"
 	CHANNEL_NAME="channel"
 
+	diag "Syscall enable channel and disable all"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_channel_ok $SESSION_NAME $CHANNEL_NAME
@@ -437,6 +471,8 @@ function test_syscall_enable_channel_disable_one()
 	SESSION_NAME="kernel_syscall_enable_channel_disable_all"
 	CHANNEL_NAME="channel"
 
+	diag "Syscall enable channel and disable one"
+
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 
 	lttng_enable_kernel_channel_ok $SESSION_NAME $CHANNEL_NAME