Skip to content

Commit 5a49d4c

Browse files
committed
fixup leak:^_PyMem_RawRealloc$
fixup qdmanage runs with system python,
1 parent 99e13b4 commit 5a49d4c

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
@@ -187,6 +187,10 @@ jobs:
187187
LD_LIBRARY_PATH: ${{github.workspace}}/install/lib
188188
QPID_SYSTEM_TEST_TIMEOUT: 300
189189
QPID_SYSTEM_TEST_SKIP_FALLBACK_SWITCHOVER_TEST: True
190+
# the PyMalloc mechanism is incompatible with Valgrind, different mechanism must be set here
191+
# https://docs.python.org/3/using/cmdline.html#envvar-PYTHONMALLOC
192+
# https://pythonextensionpatterns.readthedocs.io/en/latest/debugging/debug_python.html#debug-version-of-python-memory-alloc-label
193+
PYTHONMALLOC: malloc_debug
190194
PYTHONTRACEMALLOC: 5
191195
steps:
192196

@@ -210,7 +214,10 @@ jobs:
210214
- name: Install Python runtime/test dependencies
211215
run: ${{matrix.python}} -m pip install tox quart selectors h2 grpcio protobuf websockets pytest
212216

213-
- name: Install qpid-proton python wheel
217+
- name: Replace /usr/bin/python3 with ${{matrix.python}}, for tools such as qdmanage
218+
run: sudo ln -sf ${{matrix.python}} /usr/bin/python3
219+
220+
- name: Install qpid-proton python wheel (python3-dbg)
214221
run: ${{matrix.python}} -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
215222

216223
- name: CTest

tests/lsan.supp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ leak:^PyThread_allocate_lock$
5454
leak:^PyMem_Malloc$
5555
leak:^PyMem_Calloc$
5656
leak:^PyMem_Realloc$
57+
leak:^_PyMem_RawMalloc$
58+
leak:^_PyMem_RawRealloc$
5759
leak:^_PyObject_GC_Resize$
5860
# Python uses these alloc functions if you define PYTHONDEVMODE=1
5961
leak:^_PyMem_DebugRawAlloc$

0 commit comments

Comments
 (0)