Tests: Fix: test_list_triggers_cli: support in-kernel builtin lttng-modules

[lttng-tools.git] / tests / regression / tools / trigger / test_list_triggers_cli

diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli
index 7355f3897e6c2313c9bfd53955a522a7810f7ab8..a040180138bac02f356bcdae687dc1b826250722 100755 (executable)
--- 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=""
@@ -814,7 +814,7 @@ test_event_rule_matches_probe ()
        fi
 
        offset_hex="0x$(printf '%x' $offset)"
-       channel_enable_addr_decimal=$(echo "ibase=16; ${channel_enable_addr^^} " | bc)
+       channel_enable_addr_decimal=$(printf '%u' 0x"${channel_enable_addr}")
 
        lttng_add_trigger_ok "T0" --condition event-rule-matches --type=kprobe --location=lttng_channel_enable --event-name=my_channel_enable --action notify
        lttng_add_trigger_ok "T1" --condition event-rule-matches --type=kprobe --location="${base_symbol}+${offset_hex}" --event-name=my_channel_enable --action notify