diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2025-09-08 17:12:46 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2025-09-08 17:12:46 -0300 |
| commit | c1ead4b4dfe0f643cfc66571ca7d2fa332eddd35 (patch) | |
| tree | a22ad44bdcc8ea38401cc129e75f15fb4c533317 /tools/perf/tests/shell | |
| parent | 75a7b9d29215c5aa813b9620f3c56817918f9f8c (diff) | |
| parent | f777d1112ee597d7f7dd3ca232220873a34ad0c8 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick the fixes sent by Namhyung for tools/perf for v6.17-rc5 and get
closer to the other tools code that is used by tools/perf.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests/shell')
| -rwxr-xr-x | tools/perf/tests/shell/test_bpf_metadata.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/tests/shell/test_bpf_metadata.sh b/tools/perf/tests/shell/test_bpf_metadata.sh index 69e3c2055134..be67d56e0f09 100755 --- a/tools/perf/tests/shell/test_bpf_metadata.sh +++ b/tools/perf/tests/shell/test_bpf_metadata.sh @@ -61,7 +61,7 @@ test_bpf_metadata() { /perf_version/ { if (entry) print $NF; } - ' | egrep "$VERS" > /dev/null + ' | grep -qF "$VERS" then echo "Basic BPF metadata test [Failed invalid output]" err=1 |