From 8151829643f1fa2ea0af395dce5a4e4d323b3dfc Mon Sep 17 00:00:00 2001 From: cnc Date: Wed, 3 Jun 2026 19:46:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E8=80=83=E6=89=80=E6=9C=89=E5=88=86?= =?UTF-8?q?=E7=BB=84=EF=BC=8C=E5=AE=8C=E6=88=90=E5=B0=BD=E9=87=8F=E5=A4=9A?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E3=80=82=E7=A6=81=E6=AD=A2=E9=A1=BA?= =?UTF-8?q?=E6=89=8B=E6=89=A9=E5=8A=9F=E8=83=BD=20smoke?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 结论:补齐 kinematics manifest lister 对复合过滤器 core,header 的拒绝守卫,保持与通用 LinuxCNC manifest 组名校验一致。 --- test-all-native.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test-all-native.sh b/test-all-native.sh index 1b9a112..cd05db4 100755 --- a/test-all-native.sh +++ b/test-all-native.sh @@ -1248,6 +1248,15 @@ grep -Fx "src/objects/hal/components/xyzacb_trsrn.c" <<<"$kinematics_manifest_ge grep -Fx "src/objects/hal/components/xyzbca_trsrn.c" <<<"$kinematics_manifest_generated" >/dev/null kinematics_manifest_config_full=$(LINUXCNC_ROOT="$linuxcnc_root" ./list-linuxcnc-kinematics-manifest-sources.sh linuxcnc-kinematics-source-files.txt config full) grep -Fx "$linuxcnc_root_full/configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzac-trt.ini" <<<"$kinematics_manifest_config_full" >/dev/null +if ./list-linuxcnc-kinematics-manifest-sources.sh linuxcnc-kinematics-source-files.txt core,header >"$kinematics_unknown_filter_log" 2>&1; then + echo "kinematics manifest source lister accepted a compound filter" >&2 + exit 1 +fi +if ! grep -F "manifest source filter must be a manifest group name: core,header" "$kinematics_unknown_filter_log" >/dev/null; then + echo "kinematics manifest source lister did not report compound filters clearly" >&2 + sed -n '1,20p' "$kinematics_unknown_filter_log" >&2 + exit 1 +fi if ./list-linuxcnc-kinematics-manifest-sources.sh linuxcnc-kinematics-source-files.txt bogus >"$kinematics_unknown_filter_log" 2>&1; then echo "kinematics manifest source lister accepted unknown filter" >&2 exit 1