All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] perf tests: Fix "perf stat JSON output linter" test for new output
@ 2022-11-30 11:15 James Clark
  2022-11-30 11:15 ` [PATCH 2/2] perf stat: Fix invalid output handle James Clark
  2022-11-30 18:18 ` [PATCH 1/2] perf tests: Fix "perf stat JSON output linter" test for new output Ian Rogers
  0 siblings, 2 replies; 9+ messages in thread
From: James Clark @ 2022-11-30 11:15 UTC (permalink / raw)
  To: linux-perf-users, acme, namhyung
  Cc: linux-kernel, James Clark, Peter Zijlstra, Ingo Molnar,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Ian Rogers

Commit c4b41b83c250 ("perf stat: Rename "aggregate-number" to
"cpu-count" in JSON") renamed a field, so update the tests to reflect
this.

This fixes the following failure:

  $ sudo ./perf test "json output" -vvv
   96: perf stat JSON output linter                                    :
  --- start ---
  test child forked, pid 327720
  Checking json output: no args [Success]
  Checking json output: system wide [Success]
  Checking json output: interval [Success]
  Checking json output: event [Success]
  Checking json output: per thread [Success]
  Checking json output: per node Test failed for input:
  ...
  Traceback (most recent call last):
    File "./tools/perf/tests/shell/lib/perf_json_output_lint.py", line 93, in <module>
      check_json_output(expected_items)
    File "./tools/perf/tests/shell/lib/perf_json_output_lint.py", line 78, in check_json_output
      raise RuntimeError(f'Unexpected key: key={key} value={value}')
  RuntimeError: Unexpected key: key=cpu-count value=16
  test child finished with -1
  ---- end ----
  perf stat JSON output linter: FAILED!

Fixes: c4b41b83c250 ("perf stat: Rename "aggregate-number" to "cpu-count" in JSON")
Signed-off-by: James Clark <james.clark@arm.com>
---
 tools/perf/tests/shell/lib/perf_json_output_lint.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/tests/shell/lib/perf_json_output_lint.py b/tools/perf/tests/shell/lib/perf_json_output_lint.py
index d90f8d102eb9..9c073e257d33 100644
--- a/tools/perf/tests/shell/lib/perf_json_output_lint.py
+++ b/tools/perf/tests/shell/lib/perf_json_output_lint.py
@@ -54,7 +54,7 @@ def check_json_output(expected_items):
           raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}'
                              f' in \'{line}\'')
   checks = {
-      'aggregate-number': lambda x: isfloat(x),
+      'cpu-count': lambda x: isfloat(x),
       'core': lambda x: True,
       'counter-value': lambda x: is_counter_value(x),
       'cgroup': lambda x: True,
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-12-05 13:07 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-30 11:15 [PATCH 1/2] perf tests: Fix "perf stat JSON output linter" test for new output James Clark
2022-11-30 11:15 ` [PATCH 2/2] perf stat: Fix invalid output handle James Clark
2022-11-30 18:32   ` Namhyung Kim
2022-12-01 10:06     ` James Clark
2022-12-04 17:08       ` Athira Rajeev
2022-12-05 13:07         ` Arnaldo Carvalho de Melo
2022-11-30 18:18 ` [PATCH 1/2] perf tests: Fix "perf stat JSON output linter" test for new output Ian Rogers
2022-11-30 18:31   ` Namhyung Kim
2022-12-02 18:46   ` Arnaldo Carvalho de Melo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.