c0cef2fca0
IEC 60870 是标准族(含 104/101),原 App/protocol/ 把它拆成
iec60870/(vendor 核心)+ iec104/(我方适配)两棵同级树,多一层且
看不出「104 只维护一个」。现按标准族收口:
App/protocol/iec60870 -> App/iec60870
App/protocol/iec104 -> App/iec60870/104_port
App/protocol/{README.md,.gitkeep} 删除
App/protocol/iec104/iec104_asdu.h 删除(零 include / 零注册的孤儿)
vendor 子树(104/ common/ examples/)逐字节未改:91 个 R100 重命名、
git diff --cached -M 后 0 insertions / 0 deletions,另按字节直比 89/89
一致;UPSTREAM.sha256 差异集仍等于既有 17 项受控差异,非篡改。
适配层只改注释里的路径字样,无逻辑行。
门禁配套:
- coding-standard 的 exclude 不能写祖先 App/iec60870/——rename_ref 机械
改出的祖先形态会把 2,191 行适配层一起豁免掉。改为三条精确前缀
common/ 104/ examples/,适配层 11/11 回到受检;vendor 直调脚本仍报
88 处违规而钩子 Skipped,证明确实由 exclude 生效而非空跑。
- check_registration 的 KNOWN_GAPS 键与理由文本同步到新路径。
验证:Keil 0 errors 0 warnings(Code=367464 RO-data=48492
RW-data=2288 ZI-data=173544),构建日志与 .d 依赖证明 5 个适配 .o
真被编入;模拟器 0 警告并跑通 iec104-tcp 13/13 真实 TCP 回环;
pre-commit 25 Passed / 0 Failed;doc-links 30 处问题全在
IEC60870-Slave/ 供应商快照,我方文档零新增。
顺带删掉仓根误入库且零引用的 _all_hook.txt 与 _scope.txt。
118 lines
5.1 KiB
Python
118 lines
5.1 KiB
Python
#!/usr/bin/env python3
|
|
# -*- coding: utf-8 -*-
|
|
"""Build and run the REAL IEC104 Net MCU backend against the fake net layer.
|
|
|
|
Host-only isolation evidence for the IEC104_Net ABI (N1..N9). This is not a
|
|
full core/TcpServer run and not hardware evidence. The TEST DOUBLE B1..B7
|
|
evidence stays in results_stub/report.json.
|
|
"""
|
|
import hashlib
|
|
import json
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
|
|
HERE = os.path.dirname(os.path.abspath(__file__))
|
|
ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE)))
|
|
sys.path.insert(0, os.path.join(ROOT, "test", "host", "common"))
|
|
from unit_test_harness import locate_toolchain # noqa: E402
|
|
|
|
OUT = os.path.join(HERE, "results")
|
|
|
|
|
|
def sha256(path):
|
|
h = hashlib.sha256()
|
|
with open(path, "rb") as f:
|
|
for chunk in iter(lambda: f.read(65536), b""):
|
|
h.update(chunk)
|
|
return h.hexdigest()
|
|
|
|
|
|
def run_real(cl, inc, lib):
|
|
work = os.path.join(OUT, "real")
|
|
os.makedirs(work, exist_ok=True)
|
|
objdir = os.path.join(work, "obj")
|
|
os.makedirs(objdir, exist_ok=True)
|
|
exe = os.path.join(work, "netmcu_test.exe")
|
|
sources = [
|
|
os.path.join(HERE, "netmcu_test.c"),
|
|
os.path.join(HERE, "net_socket_fake.c"),
|
|
os.path.join(ROOT, "App", "iec60870", "104_port", "iec104_net_mcu.c"),
|
|
]
|
|
env = dict(os.environ)
|
|
env["INCLUDE"] = os.pathsep.join(inc + [
|
|
os.path.join(ROOT, "App", "iec60870", "104"),
|
|
os.path.join(ROOT, "App", "iec60870", "common"),
|
|
os.path.join(ROOT, "App", "iec60870", "104_port"),
|
|
os.path.join(ROOT, "Drivers", "BSP", "NET"),
|
|
os.path.join(HERE, "stub"),
|
|
os.path.join(ROOT, "test", "host", "net_socket", "stub"),
|
|
HERE,
|
|
])
|
|
env["LIB"] = os.pathsep.join(lib)
|
|
env["PATH"] = os.path.dirname(cl) + os.pathsep + env.get("PATH", "")
|
|
flags = ["/nologo", "/std:c11", "/W3", "/WX", "/utf-8"]
|
|
objs = []
|
|
build_log = os.path.join(work, "build.log")
|
|
with open(build_log, "wb") as log:
|
|
for src in sources:
|
|
obj = os.path.join(objdir, os.path.basename(src) + ".obj")
|
|
p = subprocess.run([cl] + flags + ["/Fo" + obj, "/c", src],
|
|
env=env, cwd=HERE, capture_output=True)
|
|
log.write((p.stdout + p.stderr).decode("utf-8", "replace").encode("utf-8"))
|
|
if p.returncode != 0:
|
|
return {"build_rc": p.returncode, "run_rc": None, "note": "compile error"}
|
|
objs.append(obj)
|
|
p = subprocess.run([cl, "/nologo", "/Fe" + exe] + objs,
|
|
env=env, cwd=HERE, capture_output=True)
|
|
log.write((p.stdout + p.stderr).decode("utf-8", "replace").encode("utf-8"))
|
|
if p.returncode != 0:
|
|
return {"build_rc": p.returncode, "run_rc": None, "note": "link error"}
|
|
r = subprocess.run([exe], env=env, cwd=work, capture_output=True)
|
|
with open(os.path.join(work, "run.log"), "wb") as f:
|
|
f.write(r.stdout + r.stderr)
|
|
text = (r.stdout + r.stderr).decode("utf-8", "replace")
|
|
fail_lines = [ln for ln in text.splitlines() if ln.strip().startswith("FAIL ")]
|
|
return {"build_rc": 0, "run_rc": r.returncode,
|
|
"failures": len(fail_lines),
|
|
"failed_cases": sorted(set(
|
|
ln.split()[1].rstrip(":") for ln in fail_lines if len(ln.split()) > 1)),
|
|
"note": ""}
|
|
|
|
|
|
def main():
|
|
os.makedirs(OUT, exist_ok=True)
|
|
cl, inc, lib = locate_toolchain()
|
|
if not cl:
|
|
print("[ENV] MSVC toolchain not found")
|
|
return 2
|
|
res = run_real(cl, inc, lib)
|
|
print("real: build_rc={} run_rc={} note={} failed_cases={}".format(
|
|
res["build_rc"], res["run_rc"], res["note"], res.get("failed_cases", [])))
|
|
report = {
|
|
"scope": "REAL backend App/iec60870/104_port/iec104_net_mcu.c + fake net layer; host-only isolation evidence, not full core/TcpServer/hardware",
|
|
"backend_sha256": sha256(os.path.join(
|
|
ROOT, "App", "iec60870", "104_port", "iec104_net_mcu.c")),
|
|
"sources": {f: sha256(os.path.join(HERE, f)) for f in [
|
|
"MATRIX.md", "net_socket_fake.h", "net_socket_fake.c",
|
|
"netmcu_test.c", "check_static.py"]},
|
|
"case_count": 13,
|
|
"case_count_basis": "13 named cases; N2a/N2b are two cases in one N2 test function",
|
|
"case_names": ["N1", "N2a", "N2b", "N3", "N4", "N5", "N6", "N7", "N8", "N9", "N10", "N11", "N12"],
|
|
"result": res,
|
|
"bad_variants": "NOT_RUN for real backend; TEST DOUBLE B1..B7 evidence retained in results_stub/report.json",
|
|
"not_run": ["full IEC104 STARTDT over core/TcpServer", "board CH395F", "MCU timing/WCET"],
|
|
"known_deviations": ["NODELAY: App/iec60870/104_port/iec104_net_mcu.h comment; CH395F has no setsockopt, treated as always no-Nagle and NOT an OK condition"],
|
|
}
|
|
with open(os.path.join(OUT, "report.json"), "w", encoding="utf-8") as f:
|
|
json.dump(report, f, indent=2, ensure_ascii=False)
|
|
if res["build_rc"] != 0 or res["run_rc"] is None:
|
|
return 1
|
|
print("real backend passed {}/{}".format(
|
|
13 - len(res.get("failed_cases", [])), 13))
|
|
return 0 if res["run_rc"] == 0 else 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|