From 574f20240511390788475bc69253a065c1beb4f8 Mon Sep 17 00:00:00 2001
From: DKChan <524912269@qq.com>
Date: Tue, 3 Nov 2026 08:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B(CI=E5=8F=AF=E8=A7=82?=
 =?UTF-8?q?=E6=B5=8B=E6=80=A7=C2=B7fix-ci-obs):=20=E8=BF=9C=E7=AB=AF?=
 =?UTF-8?q?=E7=BA=A2=E5=9B=A0=E8=AF=8A=E6=96=AD=E4=B8=89=E4=BB=B6=E2=80=94?=
 =?UTF-8?q?=E2=80=94gate()=E7=BA=A2=E6=80=81=E5=9B=9E=E6=98=BE=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=BD(=E6=98=8E=E7=BB=86=E8=A1=8C[Rx]/[Sxx]/=E8=BF=9D?=
 =?UTF-8?q?=E8=A7=84/=E5=AD=98=E9=87=8F=E5=BD=A2=E6=80=81=E5=85=A5grep,tai?=
 =?UTF-8?q?l=2012=E2=86=9260=E2=80=94=E2=80=94static=5Fscan=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E8=A1=8C=E4=B8=8D=E5=8C=B9=E9=85=8D=E6=97=A7=E8=AF=8D?=
 =?UTF-8?q?=E8=A1=A8=E8=87=B4=E7=BA=A2=E5=9B=A0=E6=BB=9E=E7=95=99runner)+g?=
 =?UTF-8?q?ate=5Funit=E7=BA=A2=E6=80=81=E6=94=B9=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E8=A1=8Cgrep(=E5=A5=97=E4=BB=B6FAIL=E6=B8=85=E5=8D=95/?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6/ABORT/=E6=B1=87=E6=80=BB,tail=2012=E2=86=928?=
 =?UTF-8?q?0)+run=5Fall=E5=A4=B1=E8=B4=A5=E6=B1=87=E6=80=BB=E8=A1=A5?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0failed=5Fpaths=E4=B8=8Etimed=5Fout=5Fpaths?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95(=E5=8E=9F=E5=85=88=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=97=A0=E5=90=8D=E5=8D=95);=20=E5=8A=A8?=
 =?UTF-8?q?=E6=9C=BA=3Drun14=E7=9A=8417=E5=A5=97=E4=BB=B6=E5=B4=A9?=
 =?UTF-8?q?=E6=AD=BB=E4=B8=8E=E8=BF=9C=E7=AB=AFS9/S10/S13=E8=BF=9D?=
 =?UTF-8?q?=E4=BE=8B=E6=98=8E=E7=BB=86=E5=85=A8=E9=83=A8=E6=BB=9E=E7=95=99?=
 =?UTF-8?q?runner=E4=BE=A7=E4=B8=8D=E5=8F=AF=E8=AF=8A=E6=96=AD,=E8=BF=9C?=
 =?UTF-8?q?=E7=AB=AF=E5=9B=9E=E4=BC=A0=E5=94=AF=E4=B8=80=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=3D=E7=BB=88=E7=AB=AF=E6=97=A5=E5=BF=97=E5=9B=9E=E6=98=BE;=20?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B077=E5=A5=97=E9=9D=A2=E5=8D=95=E5=A5=97?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81+S9=E5=BD=92=E9=9B=B6+gdstyle=20ok?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game/tests/run_all.gd  | 4 ++++
 tools/run_all_gates.sh | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/game/tests/run_all.gd b/game/tests/run_all.gd
index 49302252..308c0e0b 100644
--- a/game/tests/run_all.gd
+++ b/game/tests/run_all.gd
@@ -149,6 +149,10 @@ func _init() -> void:
 		return
 	if failures > 0:
 		push_error("[run_all] %d 个套件失败" % failures)
+		for fp in failed_paths:
+			push_error("[run_all] 失败套件: %s" % fp)
+		for tp in timed_out_paths:
+			push_error("[run_all] 超时套件: %s" % tp)
 		quit(1)
 		return
 	var tag := "，filtered" if filtered else ""
diff --git a/tools/run_all_gates.sh b/tools/run_all_gates.sh
index 6e867e36..d2af73fc 100755
--- a/tools/run_all_gates.sh
+++ b/tools/run_all_gates.sh
@@ -322,9 +322,10 @@ gate() {   # gate <名称> <日志名> <命令...>
 	echo "════════════════════════════════════════════"
 	"$@" >"$STAMP_DIR/$log" 2>&1
 	local rc=$?
-	# 失败时把关键行回显到终端（红必须看得见）
+	# 失败时把关键行回显到终端（红必须看得见——明细行形态 [Rx]/[Sxx]/违规/存量 同回显，
+	# 远端 runner 只回传终端日志，折叠过窄=红因滞留 runner 侧不可诊断）
 	if [ $rc -ne 0 ]; then
-		grep -E "FAIL|红|Error|error" "$STAMP_DIR/$log" | tail -12 | sed 's/^/  | /'
+		grep -E "FAIL|红|Error|error|违规|存量|^\[|\] FAIL" "$STAMP_DIR/$log" | tail -60 | sed 's/^/  | /'
 	fi
 	NAMES+=("$name"); EXITS+=("$rc"); LOGS+=("$log")
 	return 0
@@ -388,7 +389,9 @@ gate_unit() {   # run_all 是 --script 模式，退出码为唯一判据；分
 		rc=1
 		tail -12 "$STAMP_DIR/unit.log" | sed 's/^/  | /'
 	fi
-	[ $rc -ne 0 ] && tail -12 "$STAMP_DIR/unit.log" | sed 's/^/  | /'
+	if [ $rc -ne 0 ]; then
+		grep -E "FAIL res://|超时|ABORT|个套件失败|套件未跑|SCRIPT ERROR|Parse Error" "$STAMP_DIR/unit.log" | tail -80 | sed 's/^/  | /'
+	fi
 	NAMES+=("$name"); EXITS+=("$rc"); LOGS+=("unit.log")
 	return 0
 }