summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichael Halstead <mhalstead@linuxfoundation.org>2023-07-14 10:46:13 -0700
committerSteve Sakoman <steve@sakoman.com>2023-09-15 03:47:11 -1000
commitb347ccc7cec70e1b4ca6e68a1b2ade8747b5392e (patch)
treedf0269e7e4dd8fda629c3c1aa6f8b95019c83d6f /scripts
parentc58cd65c962559dd578c71e0942bc5cd4886a3a3 (diff)
downloadpoky-b347ccc7cec70e1b4ca6e68a1b2ade8747b5392e.tar.gz
resulttool/resultutils: allow index generation despite corrupt json
non-release indexes will continue to generate when test output is corrupted. (From OE-Core rev: 31b996c01c72749fc62821a3c9d1da70540bfad6) Signed-off-by: Michael Halstead <mhalstead@linuxfoundation.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 1a9157684a6bff8406c9bb470cb2e16ee006bbe9) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/resulttool/resultutils.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lib/resulttool/resultutils.py b/scripts/lib/resulttool/resultutils.py
index 7666331ba2..c5521d81bd 100644
--- a/scripts/lib/resulttool/resultutils.py
+++ b/scripts/lib/resulttool/resultutils.py
@@ -58,7 +58,11 @@ def append_resultsdata(results, f, configmap=store_map, configvars=extra_configv
58 testseries = posixpath.basename(posixpath.dirname(url.path)) 58 testseries = posixpath.basename(posixpath.dirname(url.path))
59 else: 59 else:
60 with open(f, "r") as filedata: 60 with open(f, "r") as filedata:
61 data = json.load(filedata) 61 try:
62 data = json.load(filedata)
63 except json.decoder.JSONDecodeError:
64 print("Cannot decode {}. Possible corruption. Skipping.".format(f))
65 data = ""
62 testseries = os.path.basename(os.path.dirname(f)) 66 testseries = os.path.basename(os.path.dirname(f))
63 else: 67 else:
64 data = f 68 data = f