[PATCH] test: Account for readahead tracepoints
[email protected] Thu, 22 Jan 2026 02:23:14 -0500
| Newsgroups | dev.linux.lists.dtrace |
|---|---|
| Message-ID | <[email protected]> |
From: Eugene Loh <[email protected]> Some tests check for empty probe descriptions. In some cases, the tests relied on the absence of any read* modules. However, some kernels can have "readahead" tracepoints. Tests expecting no read* modules will therefore fail. Change these tests to ask for readfoo* modules to ensure that the probe descriptions will indeed find no probes. Signed-off-by: Eugene Loh <[email protected]> --- test/unittest/dtrace-util/tst.ListProbesFuncEmpty.r | 2 +- test/unittest/dtrace-util/tst.ListProbesFuncEmpty.sh | 2 +- test/unittest/dtrace-util/tst.ListProbesNameEmpty.r | 2 +- test/unittest/dtrace-util/tst.ListProbesNameEmpty.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unittest/dtrace-util/tst.ListProbesFuncEmpty.r b/test/unittest/dtrace-util/tst.ListProbesFuncEmpty.r index a1e11d575..616632628 100644 --- a/test/unittest/dtrace-util/tst.ListProbesFuncEmpty.r +++ b/test/unittest/dtrace-util/tst.ListProbesFuncEmpty.r @@ -8,7 +8,7 @@ dtrace: failed to match ::profile:: No probe matches description dtrace: failed to match ::vmlinux:: No probe matches description dtrace: failed to match vmlinux:::: No probe matches description dtrace: failed to match :read::: No probe matches description -dtrace: failed to match :read*::: No probe matches description +dtrace: failed to match :readfoo*::: No probe matches description dtrace: invalid probe specifier profile:::tick-1000: invalid probe description "profile:::tick-1000": Overspecified probe description dtrace: invalid probe specifier fbt:des:des3_crunch_block:return: invalid probe description "fbt:des:des3_crunch_block:return": Overspecified probe description dtrace: invalid probe specifier read: extraneous argument '{printf("FOUND");}' ($1 is not referenced) diff --git a/test/unittest/dtrace-util/tst.ListProbesFuncEmpty.sh b/test/unittest/dtrace-util/tst.ListProbesFuncEmpty.sh index 999f138b0..b5189b3f2 100755 --- a/test/unittest/dtrace-util/tst.ListProbesFuncEmpty.sh +++ b/test/unittest/dtrace-util/tst.ListProbesFuncEmpty.sh @@ -28,7 +28,7 @@ $dtrace $dt_flags -lf profile $dtrace $dt_flags -lf vmlinux $dtrace $dt_flags -lf :vmlinux:: $dtrace $dt_flags -lf ::read: -$dtrace $dt_flags -lf ::'read*': +$dtrace $dt_flags -lf ::'readfoo*': $dtrace $dt_flags -lf profile:::tick-1000 $dtrace $dt_flags -lf fbt:des:des3_crunch_block:return # This is curiously different from what man.ListProbesWithFunctions says should diff --git a/test/unittest/dtrace-util/tst.ListProbesNameEmpty.r b/test/unittest/dtrace-util/tst.ListProbesNameEmpty.r index a89124b88..a2489f19d 100644 --- a/test/unittest/dtrace-util/tst.ListProbesNameEmpty.r +++ b/test/unittest/dtrace-util/tst.ListProbesNameEmpty.r @@ -17,5 +17,5 @@ dtrace: failed to match ::vmlinux:read: No probe matches description dtrace: failed to match :syscall:vmlinux:read: No probe matches description dtrace: failed to match ::vmlinux:: No probe matches description dtrace: failed to match fbt:des:des3_crunch_block:return: No probe matches description -dtrace: failed to match :read*::: No probe matches description +dtrace: failed to match :readfoo*::: No probe matches description dtrace: failed to match :::read: No probe matches description diff --git a/test/unittest/dtrace-util/tst.ListProbesNameEmpty.sh b/test/unittest/dtrace-util/tst.ListProbesNameEmpty.sh index 50c7fa0a1..ab2b861c4 100755 --- a/test/unittest/dtrace-util/tst.ListProbesNameEmpty.sh +++ b/test/unittest/dtrace-util/tst.ListProbesNameEmpty.sh @@ -32,6 +32,6 @@ $dtrace $dt_flags -ln vmlinux:read $dtrace $dt_flags -ln syscall:vmlinux:read $dtrace $dt_flags -ln :vmlinux: $dtrace $dt_flags -ln fbt:des:des3_crunch_block:return -$dtrace $dt_flags -ln :'read*':: +$dtrace $dt_flags -ln :'readfoo*':: $dtrace $dt_flags -ln read'{printf("FOUND");}' exit 0 -- 2.47.3