From 01a5f1e044c46a596e3bfcdf1d335a9f39273b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=98=A5=E5=A9=B7?= <272885100@qq.com> Date: Mon, 23 May 2022 02:40:25 +0000 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83-=E5=8C=85?= =?UTF-8?q?=E5=BC=95=E5=85=A5=E9=97=AE=E9=A2=98=E6=B5=8B=E8=AF=95=EF=BC=8C?= =?UTF-8?q?=E8=AF=B7=E5=8B=BF=E5=90=88=E5=B9=B6=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/fuzzlib/fuzzer_helper.py | 4 ++-- libs/fuzzlib/tools/run_result.py | 4 ++-- src/core/build/pretreat_targets.py | 3 ++- src/core/command/console.py | 3 ++- src/core/command/run.py | 3 ++- src/core/testcase/testcase_manager.py | 2 +- src/main/__init__.py | 2 +- src/main/__main__.py | 2 +- 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/libs/fuzzlib/fuzzer_helper.py b/libs/fuzzlib/fuzzer_helper.py index b8c6217..75efdfb 100644 --- a/libs/fuzzlib/fuzzer_helper.py +++ b/libs/fuzzlib/fuzzer_helper.py @@ -27,6 +27,8 @@ import pipes import traceback import time import copy +import shutil +from pprint import pprint from tools.colored import Colored from tools.templates import GN_ENTRY_TEMPLATE @@ -34,8 +36,6 @@ from tools.templates import PROJECT_GN_TEMPLATE from tools.templates import PROJECT_DEMO_TEMPLATE from tools.templates import PROJECT_HEADER_TEMPLATE from tools.templates import PROJECT_XML_TEMPLATE -import shutil -from pprint import pprint from tools.run_result import RunResult CURRENT_DIR = os.path.dirname(os.path.realpath(__file__)) diff --git a/libs/fuzzlib/tools/run_result.py b/libs/fuzzlib/tools/run_result.py index 5fb2b6e..8898e75 100644 --- a/libs/fuzzlib/tools/run_result.py +++ b/libs/fuzzlib/tools/run_result.py @@ -83,8 +83,8 @@ class RunResult(): if __name__ == "__main__": - cmd_log = "" + CMD_LOG = "" res_obj = RunResult(0, "OK") - res_obj.analysis(cmd_log, "../../../out/") + res_obj.analysis(CMD_LOG, "../../../out/") print(res_obj.crash_info) diff --git a/src/core/build/pretreat_targets.py b/src/core/build/pretreat_targets.py index 7d30c9e..c47cac8 100644 --- a/src/core/build/pretreat_targets.py +++ b/src/core/build/pretreat_targets.py @@ -21,8 +21,9 @@ import sys import json import shutil -from core.constants import JsTestConst from xdevice import platform_logger +from core.constants import JsTestConst + LOG = platform_logger("PretreatTargets") diff --git a/src/core/command/console.py b/src/core/command/console.py index a8b3822..87bbd96 100755 --- a/src/core/command/console.py +++ b/src/core/command/console.py @@ -21,9 +21,10 @@ import sys import signal import platform -from core.constants import ToolCommandType from xdevice import platform_logger from xdevice import EnvironmentManager + +from core.constants import ToolCommandType from core.command.run import Run from core.command.gen import Gen from core.command.display import display_help_info diff --git a/src/core/command/run.py b/src/core/command/run.py index d89d657..109647c 100755 --- a/src/core/command/run.py +++ b/src/core/command/run.py @@ -20,12 +20,13 @@ import time import os import sys -from core.constants import SchedulerType from xdevice import Plugin from xdevice import get_plugin from xdevice import platform_logger from xdevice import Scheduler from xdevice import DeviceTestType + +from core.constants import SchedulerType from core.utils import get_build_output_path from core.utils import scan_support_product from core.utils import is_lite_product diff --git a/src/core/testcase/testcase_manager.py b/src/core/testcase/testcase_manager.py index d0ac52a..f6837f0 100755 --- a/src/core/testcase/testcase_manager.py +++ b/src/core/testcase/testcase_manager.py @@ -18,9 +18,9 @@ import os import copy +from xdevice import platform_logger from core.utils import get_file_list_by_postfix from core.config.config_manager import FilterConfigManager -from xdevice import platform_logger LOG = platform_logger("TestcaseManager") diff --git a/src/main/__init__.py b/src/main/__init__.py index d414ea5..81cae9c 100755 --- a/src/main/__init__.py +++ b/src/main/__init__.py @@ -16,8 +16,8 @@ # limitations under the License. # -from . import _init_global_config from core.command.console import Console +from . import _init_global_config __all__ = [ "Console", diff --git a/src/main/__main__.py b/src/main/__main__.py index 72a567e..5fe4199 100755 --- a/src/main/__main__.py +++ b/src/main/__main__.py @@ -17,8 +17,8 @@ # import sys -from main import Console from xdevice import platform_logger +from main import Console LOG = platform_logger("main") -- Gitee