From 0bcd3a5c5e5fa409fb4fdf67d9b3f538945991ac Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Thu, 25 Mar 2021 13:13:45 -0400 Subject: [PATCH] Tests: Fix: test_list_triggers_cli: support in-kernel builtin lttng-modules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This commit changes the grep call to remove the [lttng_tracer] string from the pattern. When building the lttng modules directly in the kernel there is not mention of [lttng_tracer]. Furthermore, the symbol type "t" is "T" in my test VM. The difference may be due to the builtin nature of lttng on this VM. Signed-off-by: Francis Deslauriers Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau Change-Id: I046905dc51524c23ad3671b66614b86a084ef8e2 Depends-on: lttng-ust: If1f29dd64538bc5979d3e89aa5cca3be4e41046f --- tests/regression/tools/trigger/test_list_triggers_cli | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli index 162b1328b..a04018013 100755 --- a/tests/regression/tools/trigger/test_list_triggers_cli +++ b/tests/regression/tools/trigger/test_list_triggers_cli @@ -799,8 +799,8 @@ test_event_rule_matches_probe () diag "Listing event-rule-matches kernel probe" - channel_enable_addr=$(grep ' t lttng_channel_enable\s\[lttng_tracer\]$' /proc/kallsyms | cut -f 1 -d ' ') - channel_disable_addr=$(grep ' t lttng_channel_disable\s\[lttng_tracer\]$' /proc/kallsyms | cut -f 1 -d ' ') + channel_enable_addr=$(grep 'lttng_channel_enable' /proc/kallsyms | cut -f 1 -d ' ') + channel_disable_addr=$(grep 'lttng_channel_disable' /proc/kallsyms | cut -f 1 -d ' ') # We need to find a valid offset. base_symbol="" -- 2.34.1