diff --git a/pull_request_template.md b/pull_request_template.md index a6299cd28183536d34f20e0eeee90e6c7e5e07fb..e31173bde8b3a3bcf07e8ba726c43a6a4eccf0ca 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -1,49 +1,23 @@ - -Reviewer: xx -Tester:xxx - -Related Task: -=============================================== -任务链接：issues、需求或bug链接 -任务名称：xxxxx - ChangeLog: =============================================== 1. xxx 2. xxx 3. xxx - + Proc: =============================================== -1. 使用`git fetch https://gitee.com/open-skyeye/code.git pull/x/head:pr_x ` ，可复制【克隆/下载】的命令 -2. 切换到对应分支 +1. 使用【克隆/下载】里的命令，在 code 源码路径下，拉取 PR 分支，一般为 `git fetch https://gitee.com/open-skyeye/code.git pull/x/head:pr_x ` x 为 PR 序号。 +2. 切换到对应分支 `git checkout pr_x` 3. 编译安装 Open-SkyEye -4. 使用 git clone https://gitee.com/open-skyeye/testcase.git 命令克隆测试用例 +4. 使用 `git clone https://gitee.com/open-skyeye/testcase.git` 命令克隆测试用例 （如有需要） - -code：xxx分支名称 -=============================================== -commit xxxxxxxxxxxxxxxxxxxx - -Author: xxxxxxxxxx - -Date: xxxxxxxxxx -xxxxxxxxxxxxxxxxxxxxxxxx - -xxxxxxxxxxxxxxxxxxxxxxxx - -testcase:xx分支名称 -=============================================== -commit xxxxxxxxxxxxxxxxxxxx -Author: xxxxxxxxxx - -Date: xxxxxxxxxx - -xxxxxxxxxxxxxxxxxxxxxxxx - -xxxxxxxxxxxxxxxxxxxxxxxx Result: =============================================== 1. 预期结果 + +Tips: +=============================================== +1. 创建 PR 后，请在 Gitee 右侧功能栏，指定代码审核人员和测试人员。 +2. 如 PR 有关联 issues，请在右侧功能栏勾选关联的 issues \ No newline at end of file diff --git a/utils/pycli/network_control.py b/utils/pycli/network_control.py index ce49796a36cf0690345299ec1f77d77de2bf5d1b..e851923a67ae19498c4bff5b4d04bca9fa06ac64 100644 --- a/utils/pycli/network_control.py +++ b/utils/pycli/network_control.py @@ -75,9 +75,9 @@ def server_callback(request): def cancel_callback(): global is_cancel - import coverage + #import coverage is_cancel = True - coverage.set_is_cancel(True) + #coverage.set_is_cancel(True) tools.kill_all_process() def server_init(): diff --git a/utils/pycli/se_path.py b/utils/pycli/se_path.py index 453fcee1f2a8c1e583f8e05cb0628bc4bd99a959..9c0ec74379ffef75639aabdfce00d6fd67e76324 100644 --- a/utils/pycli/se_path.py +++ b/utils/pycli/se_path.py @@ -69,7 +69,7 @@ CommandPath = os.path.join(SkyEyeBin, "command") CustomPath = os.path.join(SkyEyeBin, "custom") PackageFilePath = os.path.join(InfoDir, "package.cfg") ModelPath = os.path.join(InstallDir, "uiConfig/Modeling.exe") -SeCoveragePath = os.path.join(InstallDir, "SECoverage/CoverageTools.exe") +#SeCoveragePath = os.path.join(InstallDir, "SECoverage/CoverageTools.exe") LicenseDir = os.path.join(InfoDir, "license") CacheFileDir = os.path.join(InstallDir, '.cache') ArchToolsDir = os.path.join(InstallDir, 'arch') diff --git a/utils/pycli/skyeye_gui.py b/utils/pycli/skyeye_gui.py index 94b29eeb88ad84388b21b9b328bf612236a88d3d..4df7570ef3009a633a6eff0220cb5bf499230e6e 100644 --- a/utils/pycli/skyeye_gui.py +++ b/utils/pycli/skyeye_gui.py @@ -34,7 +34,7 @@ import mips import fsel import se_path import pytimer -import coverage +#import coverage import errormessage import conf as se_conf import custom_dialog as CDialog @@ -108,7 +108,7 @@ class MainFrame(wx.Frame): self.cdialog_show = [] self.set_configure = [] - self.se_coverage = [] + #self.se_coverage = [] self.help_list = [] self.open_conf_flage = 0 self.running = False @@ -824,7 +824,7 @@ class MainFrame(wx.Frame): SkyEyeSetTimeNum(1) def stop_t(self): - coverage.kill_objdump_thread() + #coverage.kill_objdump_thread() self.end_handler() self.Destroy() global AppRestart @@ -897,7 +897,7 @@ class MainFrame(wx.Frame): self.write_memory_frame.Close() NetCtrl.server_stop() self.close_gp_config() - self.close_secoverage() + #self.close_secoverage() if len(self.help_list) != 0: for sub in self.help_list: ret = sub.poll() @@ -905,7 +905,7 @@ class MainFrame(wx.Frame): cmd = "taskkill /f /t /pid %d" % sub.pid subprocess.call(cmd) self.set_configure = [] - self.se_coverage = [] + #self.se_coverage = [] self.help_list = [] self.close_custom_dlg() @@ -1022,13 +1022,13 @@ class MainFrame(wx.Frame): for dic in self.cdialog_show: if dic[1] == custom: self.cdialog_show.remove(dic) - def close_secoverage(self): - if len(self.se_coverage) != 0: - for sub in self.se_coverage: - try: - subprocess.Popen.kill(sub) - except: - pass + # def close_secoverage(self): + # if len(self.se_coverage) != 0: + # for sub in self.se_coverage: + # try: + # subprocess.Popen.kill(sub) + # except: + # pass def close_gp_config(self): if len(self.set_configure) != 0: diff --git a/utils/pycli/views.py b/utils/pycli/views.py index 56c8e64231db84ce5c1d1b2e59fce6dc54a60a42..a54b8097e6b2bc9d3fc360c7023fb740056dce36 100644 --- a/utils/pycli/views.py +++ b/utils/pycli/views.py @@ -8,7 +8,7 @@ import cli from conf import * import _thread import time -import coverage +#import coverage import fault_inject as fi import win_workspace as ws import disassembler_interface_func as dif @@ -92,28 +92,28 @@ def soc_list(request): error="The config is None" return response(request, result, error) -def get_coverage_file(request): - result = 'false' - error = None - cpu = request["args"]["cpu"] - cover_file = coverage.write_coverage_file(cpu) - if cover_file == None: - error = "Failed to generate the coverage file" - else: - result = {"file":"%s" % cover_file} - return response(request, result, error) - -def get_objdump_file(request): - result = 'false' - error = None - cpu = request["args"]["cpu"] - source_dir = request["args"]["source_dir"] - objdump_file = coverage.write_objdump_file(cpu, source_dir) - if objdump_file ==None: - error = "Failed to generate the objdump file" - else: - result = {"file":"%s" % objdump_file} - return response(request, result, error) +# def get_coverage_file(request): +# result = 'false' +# error = None +# cpu = request["args"]["cpu"] +# cover_file = coverage.write_coverage_file(cpu) +# if cover_file == None: +# error = "Failed to generate the coverage file" +# else: +# result = {"file":"%s" % cover_file} +# return response(request, result, error) + +# def get_objdump_file(request): +# result = 'false' +# error = None +# cpu = request["args"]["cpu"] +# source_dir = request["args"]["source_dir"] +# objdump_file = coverage.write_objdump_file(cpu, source_dir) +# if objdump_file ==None: +# error = "Failed to generate the objdump file" +# else: +# result = {"file":"%s" % objdump_file} +# return response(request, result, error) def get_class_list(request): result = 'false' @@ -213,7 +213,7 @@ def quit(request): error = None if mips.mips_thread != None: mips.mips_thread.stop() - coverage.kill_objdump_thread() + # coverage.kill_objdump_thread() _thread.start_new_thread(quit_thread, (0.2, )) return response(request, result, error) @@ -307,72 +307,72 @@ def get_cpu_list(request): error="Config equal to None" return response(request,result,error) -def SE_coverage_init(request): - result = "false" - error = None - cpu = request["args"]["cpu"] - source_dir = request["args"]["source_dir"] - if SkyEyeRunningStatus() == False: - try: - result = coverage.cov_init(cpu, source_dir) - except Exception as e: - error = str(e) - else: - error = "SkyEye running" - return response(request, result, error) +# def SE_coverage_init(request): +# result = "false" +# error = None +# cpu = request["args"]["cpu"] +# source_dir = request["args"]["source_dir"] +# if SkyEyeRunningStatus() == False: +# try: +# result = coverage.cov_init(cpu, source_dir) +# except Exception as e: +# error = str(e) +# else: +# error = "SkyEye running" +# return response(request, result, error) def SE_get_running_number(request): result=None error=None - if coverage.check_variable() == True: - result=coverage.code_running_number() - else: - error="No init" + # if coverage.check_variable() == True: + # result=coverage.code_running_number() + # else: + # error="No init" return response(request, result, error) def SE_get_running_path(request): result=None error=None - if coverage.check_variable() == True: - result=coverage.code_running_path() - else: - error="No init" + # if coverage.check_variable() == True: + # result=coverage.code_running_path() + # else: + # error="No init" return response(request, result, error) def SE_get_total_cov(request): result=None error=None - if coverage.check_variable() == True: - result=coverage.count_total_cov() - else: - error="No init" + # if coverage.check_variable() == True: + # result=coverage.count_total_cov() + # else: + # error="No init" return response(request, result, error) def SE_get_all_func_cov(request): result=None error=None - if coverage.check_variable() == True: - result=coverage.count_all_func_cov() - else: - error="No init" + # if coverage.check_variable() == True: + # result=coverage.count_all_func_cov() + # else: + # error="No init" return response(request, result, error) def SE_get_single_func_cov(request): result=None error=None - if coverage.check_variable() == True: - result=coverage.count_single_func_cov() - else: - error="No init" + # if coverage.check_variable() == True: + # result=coverage.count_single_func_cov() + # else: + # error="No init" return response(request, result, error) def SE_get_project_cov_info(request): result=None error=None - if coverage.check_variable() == True: - result=coverage.get_project_info() - else: - error="No init" + # if coverage.check_variable() == True: + # result=coverage.get_project_info() + # else: + # error="No init" return response(request, result, error) def str_to_int(strs): @@ -864,8 +864,8 @@ cmd_patterns = { 'SE_set_workspace':SE_set_workspace, 'run_script':run_script, 'soc_list':soc_list, - 'coverage_file':get_coverage_file, - 'objdump_file':get_objdump_file, + # 'coverage_file':get_coverage_file, + # 'objdump_file':get_objdump_file, 'cpu_list':get_cpu_list, 'class_list':get_class_list, 'class_type':get_class_type, @@ -883,7 +883,7 @@ cmd_patterns = { 'getPinType':get_pin_type, 'readPinState':read_pin_state, 'writePinState':write_pin_state, - 'SE_coverage_init':SE_coverage_init, + # 'SE_coverage_init':SE_coverage_init, 'SE_get_running_number':SE_get_running_number, 'SE_get_running_path':SE_get_running_path, 'SE_get_total_cov':SE_get_total_cov,