From: Ian Rogers Date: Mon, 1 Dec 2025 23:11:36 +0000 (-0800) Subject: perf test: Fix hybrid testing of event fallback test X-Git-Tag: v6.19-rc1~61^2~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44f6b44027910eb9e6e6a67840f818038946e24f;p=thirdparty%2Flinux.git perf test: Fix hybrid testing of event fallback test The mem-loads-aux event exists on hybrid systems but the "cpu" PMU does not. This causes an event parsing error which erroneously makes the test look like it is failing. Avoid naming the PMU to avoid this. Rather than cleaning up perf.data in the directory the test is run, explicitly send the 'perf record' output to /dev/null and avoid any cleanup scripts. Fixes: fc9c17b22352 ("perf test: Add a perf event fallback test") Signed-off-by: Ian Rogers Reviewed-by: Dapeng Mi Signed-off-by: Namhyung Kim --- diff --git a/tools/perf/tests/shell/test_event_open_fallback.sh b/tools/perf/tests/shell/test_event_open_fallback.sh index 9c411153c01b6..9420a7557c138 100755 --- a/tools/perf/tests/shell/test_event_open_fallback.sh +++ b/tools/perf/tests/shell/test_event_open_fallback.sh @@ -6,24 +6,9 @@ skip_cnt=0 ok_cnt=0 err_cnt=0 -cleanup() -{ - rm -f perf.data - rm -f perf.data.old - trap - EXIT TERM INT -} - -trap_cleanup() -{ - cleanup - exit 1 -} - -trap trap_cleanup EXIT TERM INT - perf_record() { - perf record "$@" -- true 1>/dev/null 2>&1 + perf record -o /dev/null "$@" -- true 1>/dev/null 2>&1 } test_decrease_precise_ip() @@ -49,7 +34,7 @@ test_decrease_precise_ip_complicated() perf list pmu | grep -q 'mem-loads-aux' || return 2 - if ! perf_record -e '{cpu/mem-loads-aux/S,cpu/mem-loads/PS}'; then + if ! perf_record -e '{mem-loads-aux:S,mem-loads:PS}'; then return 1 fi return 0