From: Ian Rogers <irog...@google.com> [ Upstream commit d2e3dc829e389d686194d06f0a64adda4158faae ]
A character encoding issue added a "3D" character that breaks the metrics test. Fixes: 40769665b63d8c84 ("perf jevents: Parse metrics during conversion") Reviewed-by: Kajol Jain <kj...@linux.ibm.com> Signed-off-by: Ian Rogers <irog...@google.com> Cc: Adrian Hunter <adrian.hun...@intel.com> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: Caleb Biggers <caleb.bigg...@intel.com> Cc: Florian Fischer <florian.fischer@muhq.space> Cc: Ian Rogers <irog...@google.com> Cc: Ingo Molnar <mi...@redhat.com> Cc: James Clark <james.cl...@arm.com> Cc: Jing Zhang <renyu...@linux.alibaba.com> Cc: Jiri Olsa <jo...@kernel.org> Cc: John Garry <john.g.ga...@oracle.com> Cc: Kan Liang <kan.li...@linux.intel.com> Cc: Kang Minchul <tegongk...@gmail.com> Cc: Kim Phillips <kim.phill...@amd.com> Cc: Leo Yan <leo....@linaro.org> Cc: Mark Rutland <mark.rutl...@arm.com> Cc: Mike Leach <mike.le...@linaro.org> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Perry Taylor <perry.tay...@intel.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Ravi Bangoria <ravi.bango...@amd.com> Cc: Rob Herring <r...@kernel.org> Cc: Sandipan Das <sandipan....@amd.com> Cc: Stephane Eranian <eran...@google.com> Cc: Will Deacon <w...@kernel.org> Cc: Xing Zhengjun <zhengjun.x...@linux.intel.com> Cc: linux-arm-ker...@lists.infradead.org Cc: linuxppc-dev@lists.ozlabs.org Link: https://lore.kernel.org/r/20230126233645.200509-14-irog...@google.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> Signed-off-by: Sasha Levin <sas...@kernel.org> --- tools/perf/pmu-events/metric_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/pmu-events/metric_test.py b/tools/perf/pmu-events/metric_test.py index 15315d0f716ca..6980f452df0ad 100644 --- a/tools/perf/pmu-events/metric_test.py +++ b/tools/perf/pmu-events/metric_test.py @@ -87,8 +87,8 @@ class TestMetricExpressions(unittest.TestCase): after = r'min((a + b if c > 1 else c + d), e + f)' self.assertEqual(ParsePerfJson(before).ToPerfJson(), after) - before =3D r'a if b else c if d else e' - after =3D r'(a if b else (c if d else e))' + before = r'a if b else c if d else e' + after = r'(a if b else (c if d else e))' self.assertEqual(ParsePerfJson(before).ToPerfJson(), after) def test_ToPython(self): -- 2.39.2