diff --git a/game/tests/system_test.gd b/game/tests/system_test.gd index 2ca2e06c..2727ce49 100644 --- a/game/tests/system_test.gd +++ b/game/tests/system_test.gd @@ -337,7 +337,7 @@ func _face_snapshot(main: Node) -> Dictionary: "mf_inter": mf.inter_visible_get.call(), "mf_settlement": mf.settlement_get.call(), "mf_rows_empty": mf.rows_empty_get.call(), - "rp_log": rp.log_view, "rp_stage": rp.stage, "rp_board_zone": rp.board_zone, + "rp_stage": rp.stage, "rp_board_zone": rp.board_zone, "rp_fx": rp.settlement_fx, "rp_board": rp.board_view, "rp_refresh": rp.refresh_request, "rp_pump": rp.pump_ended, "rs_adventure": main.run_scope.adventure, "rs_runner": main.run_scope.runner, @@ -351,7 +351,7 @@ func _stage_faces(main: Node, tag: String, adv: String, run: String, set: String # 判据出处: design/engineering/test-conventions.md:56 (判定上报通道——验证函数组) var snap := _face_snapshot(main) var bad := "" - for k in ["bonus_meta", "bonus_save", "camp_meta", "camp_save", "rp_log", "rp_stage", "rp_board_zone", "rp_fx", "rp_board"]: + for k in ["bonus_meta", "bonus_save", "camp_meta", "camp_save", "rp_stage", "rp_board_zone", "rp_fx", "rp_board"]: if not is_instance_valid(snap[k]): bad += " %s=失效" % k for k in ["rp_refresh", "rp_pump"]: diff --git a/tools/run_all_gates.sh b/tools/run_all_gates.sh index 60dc692f..a19f18d5 100755 --- a/tools/run_all_gates.sh +++ b/tools/run_all_gates.sh @@ -335,9 +335,13 @@ gate() { # gate <名称> <日志名> <命令...> "$@" >"$STAMP_DIR/$log" 2>&1 local rc=$? # 失败时把关键行回显到终端(红必须看得见——明细行形态 [Rx]/[Sxx]/违规/存量 同回显, - # 远端 runner 只回传终端日志,折叠过窄=红因滞留 runner 侧不可诊断) + # 远端 runner 只回传终端日志,折叠过窄=红因滞留 runner 侧不可诊断)。 + # run_* 包装器的失败原因清单行(「 - 退出码 = …」「 - 脚本错误标记命中…」)不含下列 + # 关键字,会整组被吞——清单行一并入过滤面,另附日志原文尾部兜底。 if [ $rc -ne 0 ]; then - grep -E "FAIL|红|Error|error|违规|存量|^\[|\] FAIL" "$STAMP_DIR/$log" | tail -60 | sed 's/^/ | /' + grep -E "FAIL|红|Error|error|违规|存量|^\[|^ - |\] FAIL" "$STAMP_DIR/$log" | tail -60 | sed 's/^/ | /' + echo " | ── 日志原文尾部 $STAMP_DIR/$log ──" + tail -12 "$STAMP_DIR/$log" | sed 's/^/ | /' fi NAMES+=("$name"); EXITS+=("$rc"); LOGS+=("$log") return 0