mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
ffae400179
This adds SPDX license headers in place of the wide assortment of things currently in our script headers. We default to GPL-2.0-only except for the oeqa code where it was clearly submitted and marked as MIT on the most part or some scripts which had the "or later" GPL versioning. The patch also drops other obsolete bits of file headers where they were encoountered such as editor modelines, obsolete maintainer information or the phrase "All rights reserved" which is now obsolete and not required in copyright headers (in this case its actually confusing for licensing as all rights were not reserved). More work is needed for OE-Core but this takes care of the bulk of the scripts and meta/lib directories. The top level LICENSE files are tweaked to match the new structure and the SPDX naming. (From OE-Core rev: f8c9c511b5f1b7dbd45b77f345cb6c048ae6763e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
37 lines
1.7 KiB
Python
37 lines
1.7 KiB
Python
# resulttool - merge multiple testresults.json files into a file or directory
|
|
#
|
|
# Copyright (c) 2019, Intel Corporation.
|
|
# Copyright (c) 2019, Linux Foundation
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-only
|
|
#
|
|
|
|
import os
|
|
import json
|
|
import resulttool.resultutils as resultutils
|
|
|
|
def merge(args, logger):
|
|
if resultutils.is_url(args.target_results) or os.path.isdir(args.target_results):
|
|
results = resultutils.load_resultsdata(args.target_results, configmap=resultutils.store_map)
|
|
resultutils.append_resultsdata(results, args.base_results, configmap=resultutils.store_map)
|
|
resultutils.save_resultsdata(results, args.target_results)
|
|
else:
|
|
results = resultutils.load_resultsdata(args.base_results, configmap=resultutils.flatten_map)
|
|
if os.path.exists(args.target_results):
|
|
resultutils.append_resultsdata(results, args.target_results, configmap=resultutils.flatten_map)
|
|
resultutils.save_resultsdata(results, os.path.dirname(args.target_results), fn=os.path.basename(args.target_results))
|
|
|
|
return 0
|
|
|
|
def register_commands(subparsers):
|
|
"""Register subcommands from this plugin"""
|
|
parser_build = subparsers.add_parser('merge', help='merge test result files/directories/URLs',
|
|
description='merge the results from multiple files/directories/URLs into the target file or directory',
|
|
group='setup')
|
|
parser_build.set_defaults(func=merge)
|
|
parser_build.add_argument('base_results',
|
|
help='the results file/directory/URL to import')
|
|
parser_build.add_argument('target_results',
|
|
help='the target file or directory to merge the base_results with')
|
|
|