merge-script 0ffb20dee1 Merge bitcoin/bitcoin#34282: qa: Fix Windows logging bug ...

979d41bfab qa: Fix Windows logging bug (Hennadii Stepanov)

Pull request description:

  The regex `(.*)` was capturing `\r` from subprocess output on Windows, causing the closing parenthesis in logs to wrap to the next line.

  For [example](https://github.com/hebasto/bitcoin/actions/runs/20993438084/job/60350204808):
  ```
  208/454 - feature_bip68_sequence.py passed, Duration: 10 s
  209/454 - rpc_bind.py --ipv4 skipped (not on a Linux system
  )
  210/454 - rpc_bind.py --ipv6 skipped (not on a Linux system
  )
  211/454 - rpc_packages.py passed, Duration: 8 s
  212/454 - rpc_bind.py --nonloopback skipped (not on a Linux system
  )
  213/454 - p2p_feefilter.py passed, Duration: 4 s
  ```

  Stripping whitespace from the regex match fixes the formatting. [See](https://github.com/hebasto/bitcoin/actions/runs/20993564177/job/60350024373):
  ```
  208/454 - feature_bip68_sequence.py passed, Duration: 9 s
  209/454 - rpc_bind.py --ipv4 skipped (not on a Linux system)
  210/454 - rpc_bind.py --ipv6 skipped (not on a Linux system)
  211/454 - rpc_bind.py --nonloopback skipped (not on a Linux system)
  212/454 - rpc_packages.py passed, Duration: 7 s
  ```

ACKs for top commit:
  maflcko:
    lgtm ACK 979d41bfab
  l0rinc:
    lightly tested ACK 979d41bfab

Tree-SHA512: bafe1937a519e45e4cab395bae622acf65220f313c773a0729ba7dccc3a0a048602f1c04b3e8cdd80d2cf68ae36cef802a819530485d5a745db8abcadf141f68

2026-01-15 15:12:06 +00:00

36 KiB

Executable File

Raw Blame History

View Raw