diff options
| author | Michael Halstead <mhalstead@linuxfoundation.org> | 2023-07-14 10:46:13 -0700 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-08-26 04:24:02 -1000 |
| commit | 37ab9a97fcfcc2c5ac36a014e8fa1475abc1299c (patch) | |
| tree | 7ab80ef50c883fe49e27ffb8d36a7da67e3b33d6 /scripts/lib | |
| parent | de828a1d9d348699f0ea5ebb0d15fcdd2a8ba577 (diff) | |
| download | poky-37ab9a97fcfcc2c5ac36a014e8fa1475abc1299c.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: 9467528e89d44a016a4c1e509a3a7da56ea20f74)
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/lib')
| -rw-r--r-- | scripts/lib/resulttool/resultutils.py | 6 |
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 |
