From: "Zbigniew Kempczyński" <zbigniew.kempczynski@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t v2 02/19] scripts/igt_doc.py: add JSON file output
Date: Fri, 10 Mar 2023 20:41:08 +0100 [thread overview]
Message-ID: <20230310194125.14781-3-zbigniew.kempczynski@intel.com> (raw)
In-Reply-To: <20230310194125.14781-1-zbigniew.kempczynski@intel.com>
From: Mauro Carvalho Chehab <mchehab@kernel.org>
At least for debugging purposes, it is interesting to see how the
script is parsing the input files and expanding wildcards on a more
condensed way. So, add support to output the dictionary contents
into a json file.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
---
scripts/igt_doc.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/scripts/igt_doc.py b/scripts/igt_doc.py
index c8bd4054f6..d21f87dc71 100644
--- a/scripts/igt_doc.py
+++ b/scripts/igt_doc.py
@@ -11,6 +11,7 @@
"""Maintain test plan and test implementation documentation on IGT."""
import argparse
+import json
import re
import subprocess
import sys
@@ -231,6 +232,42 @@ class TestList:
return subtest_array
+ def expand_dictionary(self):
+
+ """ prepares a dictonary with subtest arguments expanded """
+
+ test_dict = {}
+
+ for test in self.doc: # pylint: disable=C0206
+ fname = self.doc[test]["File"]
+
+ name = re.sub(r'.*tests/', '', fname)
+ name = re.sub(r'\.[ch]', '', name)
+ name = "igt@" + name
+
+ test_dict[name] = {}
+
+ for field in self.doc[test]:
+ if field == "subtest":
+ continue
+ if field == "arg":
+ continue
+
+ test_dict[name][field] = self.doc[test][field]
+
+ subtest_array = self.expand_subtest(fname, name, test)
+ for subtest in subtest_array:
+ summary = subtest["Summary"]
+ test_dict[name][summary] = {}
+ for field in sorted(subtest.keys()):
+ if field == 'Summary':
+ continue
+ if field == 'arg':
+ continue
+ test_dict[name][summary][field] = subtest[field]
+
+ return test_dict
+
#
# Output methods
#
@@ -280,6 +317,14 @@ class TestList:
print()
print()
+ def print_json(self, out_fname):
+
+ """Adds the contents of test/subtest documentation form a file"""
+ test_dict = self.expand_dictionary()
+
+ with open(out_fname, "w", encoding='utf8') as write_file:
+ json.dump(test_dict, write_file, indent=4)
+
#
# Subtest list methods
#
@@ -541,6 +586,8 @@ parser = argparse.ArgumentParser(description = "Print formatted kernel documenta
epilog = 'If no action specified, assume --rest.')
parser.add_argument("--rest", action="store_true",
help="Generate documentation from the source files, in ReST file format.")
+parser.add_argument("--to-json",
+ help="Output test documentation in JSON format as TO_JSON file")
parser.add_argument("--show-subtests", action="store_true",
help="Shows the name of the documented subtests in alphabetical order.")
parser.add_argument("--check-testlist", action="store_true",
@@ -570,5 +617,9 @@ if parse_args.check_testlist:
RUN = 1
tests.check_tests()
+if parse_args.to_json:
+ RUN = 1
+ tests.print_json(parse_args.to_json)
+
if not RUN or parse_args.rest:
tests.print_test()
--
2.34.1
next prev parent reply other threads:[~2023-03-10 19:41 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-10 19:41 [igt-dev] [PATCH i-g-t v2 00/19] Add igt_doc.py Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 01/19] scripts/igt_doc.py: beautify its code Zbigniew Kempczyński
2023-03-10 19:41 ` Zbigniew Kempczyński [this message]
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 03/19] scripts/igt_doc.py: dynamically create fields array from a JSON file Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 04/19] scripts/igt_doc.py: add support to specify numeric values Zbigniew Kempczyński
2023-03-13 6:50 ` Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 05/19] scripts/igt_doc.py: improve --show-subtests logic Zbigniew Kempczyński
2023-03-13 6:54 ` Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 06/19] scripts/igt_doc.py: add error handler for subprocess Zbigniew Kempczyński
2023-03-13 6:55 ` Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 07/19] scripts/igt_doc.py: improve multi-line logic Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 08/19] scripts/igt_doc.py: don't use ":=" operator Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 09/19] scripts/igt_doc.py: make it compatible with Python 3.6 Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 10/19] scripts/igt_doc.py: sets the minimal version to run the script Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 11/19] scripts/igt_doc.py: use a different logic to get IGT prefix Zbigniew Kempczyński
2023-03-13 7:08 ` Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 12/19] testplan/meson.build: add targets to build Xe test documentation Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 13/19] xe/xe_test_config.json: cleanup the field struct Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 14/19] xe/xe_huc_copy: add GPU dependency to its documentation Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 15/19] xe/xe_*: add TEST/SUBTEST documentation Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 16/19] xe-fast-feedback.testlist: update debugfs tests Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 17/19] xe_mmap: skip VRAM tests if no VRAM is found Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 18/19] meson: replace "igt@xe/" by "igt@" Zbigniew Kempczyński
2023-03-10 19:41 ` [igt-dev] [PATCH i-g-t v2 19/19] scripts/igt_doc.py: set have_implemented when --files is used Zbigniew Kempczyński
2023-03-13 7:10 ` Zbigniew Kempczyński
2023-03-10 20:34 ` [igt-dev] ✓ Fi.CI.BAT: success for Add igt_doc.py (rev2) Patchwork
2023-03-13 18:34 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230310194125.14781-3-zbigniew.kempczynski@intel.com \
--to=zbigniew.kempczynski@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox