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 | |
| parent | perf vendor events: Update tigerlake metrics (diff) | |
| parent | Merge tag 'vfs-6.17-rc6.fixes' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-c1ead4b4dfe0f643cfc66571ca7d2fa332eddd35.tar.gz linux-c1ead4b4dfe0f643cfc66571ca7d2fa332eddd35.zip | |
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')
| -rw-r--r-- | tools/perf/tests/pe-file-parsing.c | 4 | ||||
| -rwxr-xr-x | tools/perf/tests/shell/test_bpf_metadata.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/tests/pe-file-parsing.c b/tools/perf/tests/pe-file-parsing.c index 30c7da79e109..8b31d1d05f90 100644 --- a/tools/perf/tests/pe-file-parsing.c +++ b/tools/perf/tests/pe-file-parsing.c @@ -37,7 +37,7 @@ static int run_dir(const char *d) size_t idx; scnprintf(filename, PATH_MAX, "%s/pe-file.exe", d); - ret = filename__read_build_id(filename, &bid); + ret = filename__read_build_id(filename, &bid, /*block=*/true); TEST_ASSERT_VAL("Failed to read build_id", ret == sizeof(expect_build_id)); TEST_ASSERT_VAL("Wrong build_id", !memcmp(bid.data, expect_build_id, @@ -49,7 +49,7 @@ static int run_dir(const char *d) !strcmp(debuglink, expect_debuglink)); scnprintf(debugfile, PATH_MAX, "%s/%s", d, debuglink); - ret = filename__read_build_id(debugfile, &bid); + ret = filename__read_build_id(debugfile, &bid, /*block=*/true); TEST_ASSERT_VAL("Failed to read debug file build_id", ret == sizeof(expect_build_id)); TEST_ASSERT_VAL("Wrong build_id", !memcmp(bid.data, expect_build_id, 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 |