Unverified Commit f1b02129 authored by debing.sun's avatar debing.sun Committed by GitHub
Browse files

Revert "Change mmap rand bits as a temporary mitigation to resolve asan bug (#13150)" (#13266)

The kernel config `vm.mmap_rnd_bits` had been revert in
https://github.com/actions/runner-images/issues/9491, so we can revert
the changes from #13150.

CI only with ASAN passed:
https://github.com/sundb/redis/actions/runs/9058263634
parent ffbdf2f6
...@@ -33,10 +33,7 @@ jobs: ...@@ -33,10 +33,7 @@ jobs:
# build with TLS module just for compilation coverage # build with TLS module just for compilation coverage
run: make SANITIZER=address REDIS_CFLAGS='-Werror -DDEBUG_ASSERTIONS' BUILD_TLS=module run: make SANITIZER=address REDIS_CFLAGS='-Werror -DDEBUG_ASSERTIONS' BUILD_TLS=module
- name: testprep - name: testprep
# Work around ASAN issue, see https://github.com/google/sanitizers/issues/1716 run: sudo apt-get install tcl8.6 tclx -y
run: |
sudo apt-get install tcl8.6 tclx -y
sudo sysctl vm.mmap_rnd_bits=28
- name: test - name: test
run: ./runtest --verbose --tags -slow --dump-logs run: ./runtest --verbose --tags -slow --dump-logs
- name: module api test - name: module api test
......
...@@ -589,11 +589,9 @@ jobs: ...@@ -589,11 +589,9 @@ jobs:
- name: make - name: make
run: make SANITIZER=address REDIS_CFLAGS='-DREDIS_TEST -Werror -DDEBUG_ASSERTIONS' run: make SANITIZER=address REDIS_CFLAGS='-DREDIS_TEST -Werror -DDEBUG_ASSERTIONS'
- name: testprep - name: testprep
# Work around ASAN issue, see https://github.com/google/sanitizers/issues/1716
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install tcl8.6 tclx -y sudo apt-get install tcl8.6 tclx -y
sudo sysctl vm.mmap_rnd_bits=28
- name: test - name: test
if: true && !contains(github.event.inputs.skiptests, 'redis') if: true && !contains(github.event.inputs.skiptests, 'redis')
run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}} run: ./runtest --accurate --verbose --dump-logs ${{github.event.inputs.test_args}}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment