X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_syscall;h=7e95dbe10a7ba3cfda786026f27de850093ba709;hp=1dcae90c3e02d744194dbdb44bc589c529198a37;hb=8192bd8fb712659b9204549f29d9a54dc2c57a9e;hpb=48ac959645b63d95e4cd6d3228448350513acab9

diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall
index 1dcae90c3..7e95dbe10 100755
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -152,16 +152,16 @@ function test_syscall_single()
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
-	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_enable_kernel_syscall_ok $SESSION_NAME "openat"
 
 	trace_testapp
 
 	# ensure all events are in the trace.
-	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_openat: -e compat_syscall_entry_openat:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_openat: -e compat_syscall_exit_openat:" $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_openat: -e compat_syscall_entry_openat: -e syscall_exit_openat: -e compat_syscall_exit_openat:" $TRACE_PATH
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -177,19 +177,19 @@ function test_syscall_two()
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
-	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_enable_kernel_syscall_ok $SESSION_NAME "openat"
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "close"
 
 	trace_testapp
 
 	# ensure all events are in the trace.
-	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_openat: -e compat_syscall_entry_openat:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_openat: -e compat_syscall_exit_openat:" $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_openat: -e compat_syscall_entry_openat: -e syscall_exit_openat: -e compat_syscall_exit_openat: -e syscall_entry_close: -e compat_syscall_entry_close: -e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -211,8 +211,8 @@ function test_syscall_all()
 	trace_testapp
 
 	# 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_openat: -e compat_syscall_entry_openat:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_openat: -e compat_syscall_exit_openat:" $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.
@@ -235,12 +235,12 @@ function test_syscall_all_disable_one()
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
 	# 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"
+	lttng_disable_kernel_syscall_fail $SESSION_NAME "openat"
 
 	trace_testapp
 
-	# 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 "openat" syscall is there.
+	validate_trace_exp "-e syscall_entry_openat: -e compat_syscall_entry_openat: -e syscall_exit_openat: -e compat_syscall_exit_openat:" $TRACE_PATH
 
 	# ensure "close" syscall is there.
 	validate_trace_exp "-e syscall_entry_close: -e compat_syscall_entry_close:" $TRACE_PATH
@@ -264,13 +264,13 @@ function test_syscall_all_disable_two()
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
 	# 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 "openat"
 	lttng_disable_kernel_syscall_fail $SESSION_NAME "close"
 
 	trace_testapp
 
-	# 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 "openat" syscall is there.
+	validate_trace_exp "-e syscall_entry_openat: -e compat_syscall_entry_openat: -e syscall_exit_openat: -e compat_syscall_exit_openat:" $TRACE_PATH
 
 	# ensure "close" syscall is there.
 	validate_trace_exp "-e syscall_entry_close: -e compat_syscall_entry_close:" $TRACE_PATH
@@ -328,8 +328,8 @@ function test_syscall_enable_all_disable_all_enable_all()
 	trace_testapp
 
 	# 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_openat: -e compat_syscall_entry_openat:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_openat: -e compat_syscall_exit_openat:" $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.
@@ -377,9 +377,9 @@ function test_syscall_enable_one_disable_one()
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable open system call
-	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_enable_kernel_syscall_ok $SESSION_NAME "openat"
 	# disable open system call
-	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_disable_kernel_syscall_ok $SESSION_NAME "openat"
 
 	trace_testapp
 
@@ -401,10 +401,10 @@ function test_syscall_enable_two_disable_two()
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable open and close system calls
-	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_enable_kernel_syscall_ok $SESSION_NAME "openat"
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "close"
 	# disable open and close system calls
-	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_disable_kernel_syscall_ok $SESSION_NAME "openat"
 	lttng_disable_kernel_syscall_ok $SESSION_NAME "close"
 
 	trace_testapp
@@ -427,7 +427,7 @@ function test_syscall_enable_two_disable_one()
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# enable open and close system calls
-	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_enable_kernel_syscall_ok $SESSION_NAME "openat"
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "close"
 	# disable close system call
 	lttng_disable_kernel_syscall_ok $SESSION_NAME "close"
@@ -435,11 +435,11 @@ function test_syscall_enable_two_disable_one()
 	trace_testapp
 
 	# 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_openat: -e compat_syscall_entry_openat:" $TRACE_PATH
+	validate_trace_exp "-e syscall_exit_openat: -e compat_syscall_exit_openat:" $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_openat: -e compat_syscall_entry_openat: -e syscall_exit_openat: -e compat_syscall_exit_openat:" $TRACE_PATH
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -455,11 +455,11 @@ function test_syscall_disable_twice()
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
-	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_enable_kernel_syscall_ok $SESSION_NAME "openat"
 	# First disable will succeed
-	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_disable_kernel_syscall_ok $SESSION_NAME "openat"
 	# Second disable succeeds too, due to enabler semantic.
-	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_disable_kernel_syscall_ok $SESSION_NAME "openat"
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -516,7 +516,7 @@ function test_syscall_enable_all_enable_one()
 
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
 	# Enabling an event already enabled succeeds, due to enabler semantic.
-	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
+	lttng_enable_kernel_syscall_ok $SESSION_NAME "openat"
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -535,7 +535,7 @@ function test_syscall_disable_all_disable_one()
 	lttng_enable_kernel_syscall_ok $SESSION_NAME
 	lttng_disable_kernel_syscall_ok $SESSION_NAME
 	# Disabling an event already disabled fails.
-	lttng_disable_kernel_syscall_fail $SESSION_NAME "open"
+	lttng_disable_kernel_syscall_fail $SESSION_NAME "openat"
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -573,7 +573,7 @@ function test_syscall_enable_channel_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
+	lttng_disable_kernel_syscall_fail $SESSION_NAME "openat" $CHANNEL_NAME
 
 	destroy_lttng_session_ok $SESSION_NAME