SoW-2020-0002: Trace Hit Counters: trigger error reporting integration

[lttng-tools.git] / tests / regression / kernel / test_syscall

diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall
index 57adad905fca6ce4750bb6c59f534747482910e9..d09d61a95aeb2e96f73ab98c47b451813dc71ecb 100755 (executable)
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -1,32 +1,52 @@
 #!/bin/bash
 #
 #!/bin/bash
 #

-# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
-# Copyright (C) - 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2013 Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

 #
 #

-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
+# SPDX-License-Identifier: GPL-2.0-only

 #
 #

-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 
 TEST_DESC="Kernel tracer - System calls"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
 
 TEST_DESC="Kernel tracer - System calls"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..

-NUM_TESTS=157
+NUM_TESTS=183

 
 

-# test command issues at least open and close system calls
-TESTCMD="cat /proc/cpuinfo > /dev/null"
+# `gen-syscall-event` starts and waits for the creation a file passed by
+# arguments to start executing 3 syscalls (open,read,close) and returning.
+TESTCMD="$TESTDIR/utils/testapp/gen-syscall-events/gen-syscall-events"

 
 source $TESTDIR/utils/utils.sh
 
 
 source $TESTDIR/utils/utils.sh
 

+function trace_testapp()
+{
+       local start_file_sync
+       start_file_sync=$(mktemp -u)
+
+       # Clear all entries from the resource tracker
+       lttng_untrack_kernel_all_ok
+
+       # Launch the testapp and save its Process ID
+       ./"$TESTCMD" "$start_file_sync" "/proc/cpuinfo" "/proc/cmdline" &
+       PID=$!
+
+       # Set LTTng to track this PID and start the tracing
+       lttng_track_pid_ok $PID
+
+       start_lttng_tracing_ok
+
+       # Create start file to launch the execution of the workload by the
+       # test app
+       touch "$start_file_sync"
+
+       wait $PID
+
+       stop_lttng_tracing_ok
+
+       # Clean up the synchronization file
+       rm -f "$start_file_sync"
+}
+

 function validate_list()
 {
        local session_name=$1
 function validate_list()
 {
        local session_name=$1


@@ -65,11 +85,9 @@ function test_syscall_simple_list()
 
        validate_list $SESSION_NAME $EVENT_NAME
 
 
        validate_list $SESSION_NAME $EVENT_NAME
 

-       start_lttng_tracing_ok
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       trace_testapp

 
 

-       # ensure each is there.
+       # ensure all events are in the trace.

        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
 
        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
 


@@ -98,15 +116,12 @@ function test_syscall_simple_list_two()
        validate_list $SESSION_NAME $EVENT_NAME
        validate_list $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_ok
+       trace_testapp

 
 

-       # ensure each is there.
+       # ensure all events are in the trace.

        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
 
        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
 
        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
 


@@ -127,18 +142,16 @@ function test_syscall_single()
 
        create_lttng_session_ok $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 "openat"

 
 

-       start_lttng_tracing_ok
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       trace_testapp

 
 

-       # 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
+       # ensure all events are in the trace.
+       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.
 
        # 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
 
 
        destroy_lttng_session_ok $SESSION_NAME
 


@@ -154,21 +167,19 @@ function test_syscall_two()
 
        create_lttng_session_ok $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 "openat"

        lttng_enable_kernel_syscall_ok $SESSION_NAME "close"
 
        lttng_enable_kernel_syscall_ok $SESSION_NAME "close"
 

-       start_lttng_tracing_ok
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       trace_testapp

 
 

-       # 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
+       # ensure all events are in the trace.
+       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_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
 
 
        destroy_lttng_session_ok $SESSION_NAME
 


@@ -187,13 +198,11 @@ function test_syscall_all()
        # enable all syscalls
        lttng_enable_kernel_syscall_ok $SESSION_NAME
 
        # enable all syscalls
        lttng_enable_kernel_syscall_ok $SESSION_NAME
 

-       start_lttng_tracing_ok
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       trace_testapp

 
        # ensure at least open and close are there.
 
        # 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.
        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.


@@ -216,14 +225,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_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"

 
 

-       start_lttng_tracing_ok
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       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
 
        # ensure "close" syscall is there.
        validate_trace_exp "-e syscall_entry_close: -e compat_syscall_entry_close:" $TRACE_PATH


@@ -247,24 +254,21 @@ 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_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"
 
        lttng_disable_kernel_syscall_fail $SESSION_NAME "close"
 

-       start_lttng_tracing_ok
-       # generates open, close, execve (at least)
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       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
        validate_trace_exp "-e syscall_exit_close: -e compat_syscall_exit_close:" $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
+       # ensure "read" syscall is there.
+       validate_trace_exp "-e syscall_entry_read: -e compat_syscall_entry_read:" $TRACE_PATH
+       validate_trace_exp "-e syscall_exit_read: -e compat_syscall_exit_read:" $TRACE_PATH

 
        destroy_lttng_session_ok $SESSION_NAME
 
 
        destroy_lttng_session_ok $SESSION_NAME
 


@@ -285,10 +289,7 @@ function test_syscall_enable_all_disable_all()
        # disable all system calls
        lttng_disable_kernel_syscall_ok $SESSION_NAME
 
        # disable all system calls
        lttng_disable_kernel_syscall_ok $SESSION_NAME
 

-       start_lttng_tracing_ok
-       # generates open, close, execve (at least)
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       trace_testapp

 
        # ensure nothing has been traced.
        validate_trace_empty $TRACE_PATH
 
        # ensure nothing has been traced.
        validate_trace_empty $TRACE_PATH


@@ -314,14 +315,11 @@ function test_syscall_enable_all_disable_all_enable_all()
        # enable all system calls
        lttng_enable_kernel_syscall_ok $SESSION_NAME
 
        # enable all system calls
        lttng_enable_kernel_syscall_ok $SESSION_NAME
 

-       start_lttng_tracing_ok
-       # generates open, close, execve (at least)
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       trace_testapp

 
        # ensure at least open and close are there.
 
        # 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.
        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.


@@ -349,10 +347,7 @@ function test_syscall_enable_all_disable_all_twice()
        # disable all system calls
        lttng_disable_kernel_syscall_ok $SESSION_NAME
 
        # disable all system calls
        lttng_disable_kernel_syscall_ok $SESSION_NAME
 

-       start_lttng_tracing_ok
-       # generates open, close, execve (at least)
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       trace_testapp

 
        # ensure nothing has been traced.
        validate_trace_empty $TRACE_PATH
 
        # ensure nothing has been traced.
        validate_trace_empty $TRACE_PATH


@@ -372,14 +367,11 @@ function test_syscall_enable_one_disable_one()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
        # enable open system call
        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
        # disable open system call

-       lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
+       lttng_disable_kernel_syscall_ok $SESSION_NAME "openat"

 
 

-       start_lttng_tracing_ok
-       # generates open, close, execve (at least)
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       trace_testapp

 
        # ensure nothing has been traced.
        validate_trace_empty $TRACE_PATH
 
        # ensure nothing has been traced.
        validate_trace_empty $TRACE_PATH


@@ -399,16 +391,13 @@ function test_syscall_enable_two_disable_two()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
        # enable open and close system calls
        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_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"
 
        lttng_disable_kernel_syscall_ok $SESSION_NAME "close"
 

-       start_lttng_tracing_ok
-       # generates open, close, execve (at least)
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       trace_testapp

 
        # ensure nothing has been traced.
        validate_trace_empty $TRACE_PATH
 
        # ensure nothing has been traced.
        validate_trace_empty $TRACE_PATH


@@ -428,22 +417,19 @@ function test_syscall_enable_two_disable_one()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
        # enable open and close system calls
        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"
 
        lttng_enable_kernel_syscall_ok $SESSION_NAME "close"
        # disable close system call
        lttng_disable_kernel_syscall_ok $SESSION_NAME "close"
 

-       start_lttng_tracing_ok
-       # generates open, close, execve (at least)
-       eval ${TESTCMD}
-       stop_lttng_tracing_ok
+       trace_testapp

 
        # ensure open is there.
 
        # 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.
 
        # 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
 
 
        destroy_lttng_session_ok $SESSION_NAME
 


@@ -459,11 +445,11 @@ function test_syscall_disable_twice()
 
        create_lttng_session_ok $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 "openat"

        # First disable will succeed
        # 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.
        # 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
 
 
        destroy_lttng_session_ok $SESSION_NAME
 


@@ -520,7 +506,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
        # 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
 
 
        destroy_lttng_session_ok $SESSION_NAME
 


@@ -539,7 +525,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_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
 
 
        destroy_lttng_session_ok $SESSION_NAME
 


@@ -577,7 +563,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
        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
 
 
        destroy_lttng_session_ok $SESSION_NAME