Skip to content

Commit e812e7c

Browse files
authored
fix: failing clang-asan/llvm-cov tests (#965)
* Update Python test dependencies * Update clang on Linux to 15.0.7 * Adapt mmap_rnd_bit according to actions/runner-images#9513
1 parent 8f26229 commit e812e7c

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ jobs:
4949
# RUN_ANALYZER: gcc
5050
- name: Linux (clang + asan + llvm-cov)
5151
os: ubuntu-22.04
52-
CC: clang-14
53-
CXX: clang++-14
52+
CC: clang-15
53+
CXX: clang++-15
5454
ERROR_ON_WARNINGS: 1
5555
RUN_ANALYZER: asan,llvm-cov
5656
- name: Linux (clang + kcov)
5757
os: ubuntu-22.04
58-
CC: clang-14
59-
CXX: clang++-14
58+
CC: clang-15
59+
CXX: clang++-15
6060
ERROR_ON_WARNINGS: 1
6161
RUN_ANALYZER: kcov
6262
- name: Linux (gcc + code-checker + valgrind)
@@ -137,6 +137,11 @@ jobs:
137137
sudo apt update
138138
sudo apt install cmake gcc-7-multilib g++-7-multilib zlib1g-dev:i386 libssl-dev:i386 libcurl4-openssl-dev:i386
139139
140+
# https://github.com/actions/runner-images/issues/9491
141+
- name: Decrease vm.mmap_rnd_bit to prevent ASLR ASAN issues
142+
if: ${{ runner.os == 'Linux' && contains(env['RUN_ANALYZER'], 'asan') }}
143+
run: sudo sysctl vm.mmap_rnd_bits=28
144+
140145
- name: Installing CodeChecker
141146
if: ${{ contains(env['RUN_ANALYZER'], 'code-checker') }}
142147
run: sudo snap install codechecker --classic

tests/assertions.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ def assert_meta(
5454
"user": {"id": 42, "username": "some_name"},
5555
"transaction": transaction,
5656
"tags": {"expected-tag": "some value"},
57-
"extra": {"extra stuff": "some value", "…unicode key…": "őá…–🤮🚀¿ 한글 테스트"},
57+
"extra": {
58+
"extra stuff": "some value",
59+
"…unicode key…": "őá…–🤮🚀¿ 한글 테스트",
60+
},
5861
}
5962
expected_sdk = {
6063
"name": "sentry.native",

tests/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
black==23.3.0
2-
pytest==7.4.0
3-
pytest-httpserver==1.0.8
4-
msgpack==1.0.5
1+
black==24.2.0
2+
pytest==8.0.1
3+
pytest-httpserver==1.0.10
4+
msgpack==1.0.8

0 commit comments

Comments
 (0)