已合并
fix script error #138
lishengvictor创建于 1 天前
fix script error #138
已合并
lishengvictor创建于 1 天前
lishengvictor
lishengvictor成员
1 天前

描述

关联的Issue

测试

文档更新

类型标签

likedislike
Pull Request已成功合入, 合并人@CANN-robot
(感谢 lishengvictor 的贡献)
lishengvictorlishengvictor成员
1 天前 创建了 pull request,commit bcddddfb
lishengvictorlishengvictor成员
1 天前 关联了issue:[Bug-Report]: npu_log_collect.sh:40 条件表达式缺空格——`-eq 0]]` 语法错误
atomgit-bot
atomgit-bot
1 天前 评论:

变更摘要

本 PR 旨在修复 npu_log_collect.sh 脚本中的语法错误。核心改动是将 if [[ "$CHIP_NUM_910_95" -eq 0]]; then 中缺失的空格补上,改为 if [[ "$CHIP_NUM_910_95" -eq 0 ]]; then,避免 Bash 因条件表达式缺少空格而报语法错误。除此之外,其余改动均为移除多处行尾空白字符,属于纯格式整理,不影响脚本行为。

主要改动

  • 修复条件判断语法错误:在 usage() 函数中,将 if [[ "$CHIP_NUM_910_95" -eq 0]]; then 修正为 if [[ "$CHIP_NUM_910_95" -eq 0 ]]; then,补上 0]] 之间缺失的空格,消除脚本解析错误,这是本 PR 的实际修复点
  • 清理 collect_full() 中的行尾空白:移除函数调用(如 mainget_pcie_logwait)及空行处的多余空格和 Tab,属格式调整
  • 清理日志采集相关函数的行尾空白:移除 get_version_infoget_pcie_logget_driver_logget_device_logcollect_npu_info_logcollect_mcu_lognetwork_info_collectcreate_log_collect_dirparse_args 等函数中 echo 语句和命令末尾的多余空格,均为无业务影响的格式整理
likedislike
atomgit-bot
atomgit-bot
1 天前 评论:

代码审查

✅ 未发现问题

likedislike
CANN-robotCANN-robot成员
1 天前 添加了label:cann-cla/yes
CANN-robot
CANN-robot成员
1 天前 评论:

CLA Signature Pass

lishengvictor, thanks for your pull request. All authors of the commits have signed the CLA. 👍

likedislike
CANN-robot
CANN-robot成员
1 天前 评论:

Thanks for your pull-request.
The full list of commands accepted by me can be found at here.
You can get sig-info at here.
You can self-configure the PR merge rules for this repository. For more details, please refer to Here.
For more, you also can visit HICANN.


PR Approval Progress

Congratulations! All modules have met the lgtm and approve requirements.

Module Approval Details

module lgtm status approve status
repo-cann/driver 潘玉园, 冯呈祥 (2/2) 冯呈祥 (1/1)

💡 Tip:

  • Committer can comment /approve or /lgtm
  • Commenting /approve implies both code review (lgtm) and intent to merge (approve)
likedislike
CANN-robotCANN-robot成员
1 天前 将linyt_86,yanmingxiang,ad_cx,Panyuyuan,yangxiaoyuan,xxwyhq0,StarMickey33设为评审人
CANN-robotCANN-robot成员
1 天前 将linyt_86,yanmingxiang,ad_cx,Panyuyuan,yangxiaoyuan,xxwyhq0,StarMickey33设为审查人
lishengvictorlishengvictor成员
1 天前 修改了pull request 的描述
lishengvictor
lishengvictor成员
1 天前 评论:

compile

likedislike
CANN-robotCANN-robot成员
1 天前 添加了label:ci-pipeline-running
CANN-robot
CANN-robot成员
1 天前 评论:

流水线任务触发成功
任务链接 [000ff131b59d43b18da75752b9b5ae82][流水线指导]

任务名称状态日志下载链接
codecheck ✅ SUCCESS >>>>>
SCA ❌ FAILED >>>>>
antipoison ✅ SUCCESS >>>>>
Check_Pr ✅ SUCCESS >>>>>
Compile_Ascend_X86_driver_ubuntu_24_04_npu_910b ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_driver_ubuntu_24_04_npu_910_93 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_driver_npu_910_93 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_driver_npu_910b ✅ SUCCESS >>>>> >>>>>
API_Check ✅ SUCCESS >>>>>
Compile_Ascend_X86_driver-dev_ubuntu_24_04_compat_950 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_driver-dev_ubuntu_24_04_npu_950 ✅ SUCCESS >>>>> >>>>>
cocheck_codestyle ✅ SUCCESS
Compile_Ascend_ARM_driver_npu_sp4 ✅ SUCCESS >>>>>
Compile_Ascend_ARM_driver-dev_compat_sp4 ✅ SUCCESS >>>>> >>>>>
precommit ✅ SUCCESS >>>>>
pre_comment ✅ SUCCESS >>>>>
likedislike
CANN-robotCANN-robot成员
1 天前 添加了label:api-check-pass
CANN-robotCANN-robot成员
1 天前 删除了label:ci-pipeline-running
CANN-robotCANN-robot成员
1 天前 添加了label:ci-pipeline-failed
CANN-robot
CANN-robot成员
1 天前 评论:
流水线 PR-pipeline_cann_driver#416 [ commitID:d41e76fd ] 运行失败
likedislike
lishengvictor
lishengvictor成员
1 天前 评论:

compile

likedislike
CANN-robotCANN-robot成员
1 天前 删除了label:ci-pipeline-failedapi-check-pass
CANN-robotCANN-robot成员
1 天前 添加了label:ci-pipeline-running
CANN-robot
CANN-robot成员
1 天前 评论:

流水线任务触发成功
任务链接 [a5661f83758f476d87113826fc4a8d08][流水线指导]

任务名称状态日志下载链接
codecheck ✅ SUCCESS >>>>>
SCA ✅ SUCCESS >>>>>
antipoison ✅ SUCCESS >>>>>
Check_Pr ✅ SUCCESS >>>>>
Compile_Ascend_X86_driver_ubuntu_24_04_npu_910b ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_driver_ubuntu_24_04_npu_910_93 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_driver_npu_910_93 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_driver_npu_910b ✅ SUCCESS >>>>> >>>>>
API_Check ✅ SUCCESS >>>>>
Compile_Ascend_X86_driver-dev_ubuntu_24_04_compat_950 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_driver-dev_ubuntu_24_04_npu_950 ✅ SUCCESS >>>>> >>>>>
cocheck_codestyle ✅ SUCCESS
Compile_Ascend_ARM_driver_npu_sp4 ✅ SUCCESS >>>>>
Compile_Ascend_ARM_driver-dev_compat_sp4 ✅ SUCCESS >>>>> >>>>>
precommit ✅ SUCCESS >>>>>
pre_comment ✅ SUCCESS >>>>>
UT_Test ✅ SUCCESS >>>>>
PreSmoke_A2 ✅ SUCCESS >>>>>

[2026-08-25 11:48:58]    CI执行结束

likedislike
CANN-robotCANN-robot成员
1 天前 添加了label:api-check-pass
CANN-robotCANN-robot成员
1 天前 删除了label:ci-pipeline-running
CANN-robotCANN-robot成员
1 天前 添加了label:ci-pipeline-passed
CANN-robot
CANN-robot成员
1 天前 评论:
流水线 PR-pipeline_cann_driver#417 [ commitID:d41e76fd ] 已完成
likedislike
PAN成员
14 小时前 评论:

/lgtm

likedislike
ad_cx成员
14 小时前 评论:

/approve

likedislike
CANN-robotCANN-robot成员
14 小时前 添加了label:lgtmapproved
CANN-robotCANN-robot成员
14 小时前 合入了pull request