Skip to content

Commit 71de8af

Browse files
committed
fixup! Add custom action and unified Linux build
1 parent 00552d3 commit 71de8af

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/OCV-PR-Linux.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,10 @@ jobs:
110110
${{ matrix.limited_api && '-DPYTHON3_LIMITED_API=ON' }}
111111
${{ matrix.asan && '-DENABLE_OMIT_FRAME_POINTER=OFF -DCMAKE_CXX_FLAGS="-fsanitize=address"' }}
112112
HOME: ${{ contains(matrix.image, '24.04') && '/home/ubuntu' || '/home/ci' }}
113-
OPENCV_FOR_THREADS_NUM: 8
114-
CMAKE_BUILD_PARALLEL_LEVEL: 8
113+
# OPENCV_FOR_THREADS_NUM: 8
114+
# CMAKE_BUILD_PARALLEL_LEVEL: 8
115+
OPENCV_FOR_THREADS_NUM: 10
116+
CMAKE_BUILD_PARALLEL_LEVEL: 20
115117

116118
# ==========
117119

@@ -166,6 +168,7 @@ jobs:
166168
OPENCV_TEST_REQUIRE_DATA: 1
167169
OPENCV_TEST_CHECK_OPTIONAL_DATA: 1
168170
PYTHONPATH: '${{ env.HOME }}/build/python_loader:$PYTHONPATH'
171+
ASAN_OPTIONS: 'detect_leaks=0'
169172
with:
170173
workdir: '${{ env.HOME }}'
171174
builddir: 'build'

scripts/runner.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
case_begin = re.compile(r"^\[ RUN \] (.*)$")
2727
case_end = re.compile(r"^\[ OK \] (.*) \(\d+ ms\)$")
2828
case_fail = re.compile(r"^\[ FAILED \] (.*) \(\d+ ms\)$")
29+
asan_fail = re.compile(r"^==\d+==ABORTING$")
2930
summary_begin = re.compile(r"^\[----------\] Global test environment tear-down$")
3031

3132

@@ -62,7 +63,7 @@ async def read_process(proc, verbose, logfd):
6263
if case_end.match(line):
6364
state = STATE_START
6465
continue
65-
if case_fail.match(line):
66+
if case_fail.match(line) or asan_fail.match(line):
6667
state = STATE_START
6768
if not verbose:
6869
print("\n".join(case_output), flush=True)

0 commit comments

Comments
 (0)