diff --git a/scripts/verify.sh b/scripts/verify.sh index 69e1271..d4622e7 100644 --- a/scripts/verify.sh +++ b/scripts/verify.sh @@ -111,9 +111,9 @@ echo "== 第二段:go test -count=1 -v $GOFLAGS_EXTRA $RUNARG $PKGS" go test -count=1 -v $GOFLAGS_EXTRA -timeout 2400s $RUNARG $PKGS >"$LOG" 2>&1 RC=$? -PASS=$(grep -c '^--- PASS' "$LOG" || true) -FAILN=$(grep -c '^--- FAIL' "$LOG" || true) -SKIP=$(grep -c '^--- SKIP' "$LOG" || true) +PASS=$(grep -cE '^[[:space:]]*--- PASS' "$LOG" || true) +FAILN=$(grep -cE '^[[:space:]]*--- FAIL' "$LOG" || true) +SKIP=$(grep -cE '^[[:space:]]*--- SKIP' "$LOG" || true) BADPKG=$(grep -c '^FAIL' "$LOG" || true) echo "== 结果:PASS=$PASS FAIL=$FAILN SKIP=$SKIP 非ok包=$BADPKG" @@ -121,11 +121,11 @@ echo "== 日志:$LOG" if [ "$SKIP" != 0 ]; then echo "-- 以下用例被跳过(=没跑。门控测试缺环境变量时 go test 依然回 ok,别当通过看)--" - grep -n -B1 '^--- SKIP' "$LOG" | head -40 + grep -n -B1 -E '^[[:space:]]*--- SKIP' "$LOG" | head -40 fi if [ "$FAILN" != 0 ] || [ "$BADPKG" != 0 ]; then echo "-- 失败明细(前 40 行)--" - grep -n -B2 '^--- FAIL' "$LOG" | head -40 + grep -n -B2 -E '^[[:space:]]*--- FAIL' "$LOG" | head -40 fi if [ "$RC" != 0 ] || [ "$FAILN" != 0 ] || [ "$BADPKG" != 0 ]; then