merge-script 755f0900a2 Merge bitcoin/bitcoin#34136: test: Allow mempool_updatefromblock.py to run on 32-bit ...

fac5a1b10a test: Allow mempool_updatefromblock.py to run on 32-bit (MarcoFalke)

Pull request description:

  The number of dropped parent transactions in the `test_max_disconnect_pool_bytes` test was hard-coded to `2`.

  This happens to work fine on 64-bit for now. However, it seems to fail on 32-bit (https://github.com/bitcoin/bitcoin/issues/34108).

  I don't think we care about the exact number, as long as it is at least `1`.

  So hard-code `1` for an initial sanity check, and then calculate the exact value at runtime via `len(mempool) // 2`.

  Also, enable the functional tests in 32-bit CI, to confirm the regression test.

  Fixes https://github.com/bitcoin/bitcoin/issues/34108

ACKs for top commit:
  bensig:
    ACK fac5a1b10a
  instagibbs:
    ACK fac5a1b10a

Tree-SHA512: 8d468f306d95e52cbfac1803293e3b8e9575c9010200010c7833382112509e0d51827dc9681b0b68eeae742af2c14d12da5fd4cf0e1d871a02f91fc80e6720d1

2026-01-05 14:51:24 +00:00

..

00_setup_env_arm.sh

test: Allow mempool_updatefromblock.py to run on 32-bit

2025-12-22 11:54:59 +01:00

00_setup_env_i686_no_ipc.sh

ci: Enable experimental kernel stuff in i686 task

2025-11-12 10:12:49 +01:00

00_setup_env_mac_cross_intel.sh

ci: Enable experimental kernel stuff in mac-cross tasks

2025-11-12 10:12:47 +01:00

00_setup_env_mac_cross.sh

ci: Enable experimental kernel stuff in mac-cross tasks

2025-11-12 10:12:47 +01:00

00_setup_env_mac_native_fuzz.sh

ci: add libcpp hardening flags to macOS fuzz job

2025-10-08 10:42:25 +01:00

00_setup_env_mac_native.sh

ci: [refactor] Use --preset=dev-mode in mac_native task

2025-11-12 13:09:54 +01:00

00_setup_env_native_alpine_musl.sh

ci: Enable experimental kernel stuff in Alpine task

2025-11-12 10:12:21 +01:00

00_setup_env_native_asan.sh

ci: Enable experimental kernel stuff in ASan task

2025-11-11 12:35:18 +01:00

00_setup_env_native_fuzz_with_msan.sh

ci: Drop libFuzzer from msan fuzz task

2025-10-21 11:33:12 +02:00

00_setup_env_native_fuzz_with_valgrind.sh

cmake: set ENABLE_IPC by default

2025-08-14 20:57:38 +02:00

00_setup_env_native_fuzz.sh

ci: use LLVM 21

2025-08-26 17:11:45 +01:00

00_setup_env_native_iwyu.sh

iwyu, clang-format: Sort includes

2025-12-17 20:29:36 +00:00

00_setup_env_native_msan.sh

ci: Enable experimental kernel stuff in MSan task

2025-11-12 10:11:43 +01:00

00_setup_env_native_nowallet.sh

ci: [refactor] Base nowallet task on --preset=dev-mode

2025-11-12 13:07:36 +01:00

00_setup_env_native_previous_releases.sh

ci: Enable experimental kernel stuff in G++-12 task (previous releases)

2025-11-11 22:44:09 +01:00

00_setup_env_native_tidy.sh

ci: Extend tidy job to cover kernel code

2025-11-07 14:24:48 +00:00

00_setup_env_native_tsan.sh

ci: Enable experimental kernel stuff in TSan task

2025-11-12 10:11:47 +01:00

00_setup_env_native_valgrind.sh

ci: Enable experimental kernel stuff in valgrind task

2025-11-12 10:11:51 +01:00

00_setup_env_s390x.sh

ci: Enable experimental kernel stuff in s390x task

2025-11-12 10:11:55 +01:00

00_setup_env_win64_msvcrt.sh

ci: Rename items specific to Windows + MSVCRT

2025-11-21 14:26:59 +00:00

00_setup_env_win64.sh

ci: Remove redundant DEP_OPTS from “Windows-cross UCRT” job

2025-11-30 11:27:17 +00:00

00_setup_env.sh

ci: Remove redundant busybox option

2025-11-20 20:22:43 +01:00

01_base_install.sh

ci: Add IWYU job

2025-12-17 20:29:25 +00:00

01_iwyu.patch

iwyu: Add patch to prefer C++ headers over C counterparts

2025-12-17 20:28:55 +00:00

02_run_container.py

Merge bitcoin/bitcoin#33732: ci: Call docker exec from Python script to fix word splitting

2025-12-19 15:40:27 +00:00

03_test_script.sh

Merge bitcoin/bitcoin#33810: ci: Add IWYU job

2025-12-22 17:38:50 +00:00

GetCMakeLogFiles.cmake

ci: Handle log files regardless of CMake's version

2024-09-07 14:38:14 +01:00

wrap-valgrind.sh

ci: Enable feature_init and wallet_reorgsrestore in valgrind task

2025-05-15 17:59:50 +02:00