Skip to content

Commit 3e8b3d0

Browse files
committed
fixup leak:^_PyMem_RawRealloc$
fixup qdmanage runs with system python,
1 parent 4b9f6d5 commit 3e8b3d0

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

.github/workflows/build.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,10 @@ jobs:
196196
LD_LIBRARY_PATH: ${{github.workspace}}/install/lib
197197
QPID_SYSTEM_TEST_TIMEOUT: 300
198198
QPID_SYSTEM_TEST_SKIP_FALLBACK_SWITCHOVER_TEST: True
199+
# the PyMalloc mechanism is incompatible with Valgrind, different mechanism must be set here
200+
# https://docs.python.org/3/using/cmdline.html#envvar-PYTHONMALLOC
201+
# https://pythonextensionpatterns.readthedocs.io/en/latest/debugging/debug_python.html#debug-version-of-python-memory-alloc-label
202+
PYTHONMALLOC: malloc_debug
199203
PYTHONTRACEMALLOC: 5
200204
steps:
201205

@@ -228,7 +232,10 @@ jobs:
228232
- name: Install Python runtime/test dependencies
229233
run: ${{matrix.python}} -m pip install tox quart selectors h2 grpcio protobuf websockets pytest
230234

231-
- name: Install qpid-proton python wheel
235+
- name: Replace /usr/bin/python3 with ${{matrix.python}}, for tools such as qdmanage
236+
run: sudo ln -sf ${{matrix.python}} /usr/bin/python3
237+
238+
- name: Install qpid-proton python wheel (python3-dbg)
232239
run: ${{matrix.python}} -m pip install $(find ${ProtonBuildDir}/python/ -name 'python_qpid_proton*.whl')
233240

234241
- name: CTest

tests/lsan.supp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ leak:^PyThread_allocate_lock$
5858
leak:^PyMem_Malloc$
5959
leak:^PyMem_Calloc$
6060
leak:^PyMem_Realloc$
61+
leak:^_PyMem_RawMalloc$
62+
leak:^_PyMem_RawRealloc$
6163
leak:^_PyObject_GC_Resize$
6264
# Python uses these alloc functions if you define PYTHONDEVMODE=1
6365
leak:^_PyMem_DebugRawAlloc$

0 commit comments

Comments
 (0)