Fix: syscall test: add missing semicolumns in match

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

diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall
index 5e6b7467b284ac130b3f7358d2a604fc226a3e7f..55baab877375e7905595de941846112067ea9d1e 100755 (executable)
--- 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=124
+NUM_TESTS=132
 
 # test command issues at least open and close system calls
 TESTCMD="cat /proc/cpuinfo > /dev/null"
@@ -41,11 +41,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
 
@@ -67,13 +67,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
 
@@ -95,10 +95,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
@@ -123,11 +123,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
 
@@ -153,11 +153,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
 
@@ -209,10 +209,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
@@ -320,11 +320,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
 
@@ -415,6 +415,38 @@ 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"
+
+       create_lttng_session $SESSION_NAME $TRACE_PATH
+
+       lttng_enable_kernel_channel_ok $SESSION_NAME $CHANNEL_NAME
+       lttng_disable_kernel_syscall_fail $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"
+
+       create_lttng_session $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
 
@@ -446,6 +478,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
 }