Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-11-04 03:27:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use the new env var to disable RTLD_DEEPBIND for pycryptodome when running the tests with sanitization enabled

Browse Source
This commit is contained in:
Kovid Goyal 2021-10-04 14:39:42 +05:30
parent 05a327688c
commit f027fac8a2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup/arch-ci.sh
View File

@ -8,6 +8,7 @@ set -xe
pacman -S --noconfirm --needed base-devel sudo git sip pyqt-builder chmlib icu jxrlib hunspell libmtp libusb libwmf optipng podofo python-apsw python-beautifulsoup4 python-cssselect python-css-parser python-dateutil python-jeepney python-dnspython python-dukpy python-feedparser python-html2text python-html5-parser python-lxml python-markdown python-mechanize python-msgpack python-netifaces python-unrardll python-pillow python-psutil python-pygments python-pyqt5 python-regex python-zeroconf python-pyqtwebengine qt5-x11extras qt5-svg qt5-imageformats udisks2 hyphen python-pychm python-pycryptodome speech-dispatcher python-sphinx python-urllib3 python-py7zr python-pip python-cchardet libstemmer pacman -S --noconfirm --needed base-devel sudo git sip pyqt-builder chmlib icu jxrlib hunspell libmtp libusb libwmf optipng podofo python-apsw python-beautifulsoup4 python-cssselect python-css-parser python-dateutil python-jeepney python-dnspython python-dukpy python-feedparser python-html2text python-html5-parser python-lxml python-markdown python-mechanize python-msgpack python-netifaces python-unrardll python-pillow python-psutil python-pygments python-pyqt5 python-regex python-zeroconf python-pyqtwebengine qt5-x11extras qt5-svg qt5-imageformats udisks2 hyphen python-pychm python-pycryptodome speech-dispatcher python-sphinx python-urllib3 python-py7zr python-pip python-cchardet libstemmer
# See https://github.com/Legrandin/pycryptodome/issues/376 # See https://github.com/Legrandin/pycryptodome/issues/376
# Can be removed when https://github.com/Legrandin/pycryptodome/issues/558 is released
file_to_patch=$(pacman -Ql python-pycryptodome | grep _raw_api.py$ | cut -d" " -f2) file_to_patch=$(pacman -Ql python-pycryptodome | grep _raw_api.py$ | cut -d" " -f2)
echo "Patching $file_to_patch" echo "Patching $file_to_patch"
sed -i 's/RTLD_DEEPBIND/RTLD_DEEPBIND_DISABLED_BY_KOVID/g' "$file_to_patch" sed -i 's/RTLD_DEEPBIND/RTLD_DEEPBIND_DISABLED_BY_KOVID/g' "$file_to_patch"

6
setup/test.py
View File

@ -181,9 +181,11 @@ class Test(Command):
help='Run the test suite with the sanitizer preloaded') help='Run the test suite with the sanitizer preloaded')
def run(self, opts): def run(self, opts):
if opts.under_sanitize and 'libasan' not in os.environ.get('LD_PRELOAD', ''): if opts.under_sanitize:
os.environ['LD_PRELOAD'] = os.path.abspath(subprocess.check_output('gcc -print-file-name=libasan.so'.split()).decode('utf-8').strip()) if 'libasan' not in os.environ.get('LD_PRELOAD', ''):
os.environ['LD_PRELOAD'] = os.path.abspath(subprocess.check_output('gcc -print-file-name=libasan.so'.split()).decode('utf-8').strip())
os.environ['ASAN_OPTIONS'] = 'detect_leaks=0' os.environ['ASAN_OPTIONS'] = 'detect_leaks=0'
os.environ['PYCRYPTODOME_DISABLE_DEEPBIND'] = 1 # https://github.com/Legrandin/pycryptodome/issues/558
self.info(f'Re-execing with LD_PRELOAD={os.environ["LD_PRELOAD"]}') self.info(f'Re-execing with LD_PRELOAD={os.environ["LD_PRELOAD"]}')
sys.stdout.flush() sys.stdout.flush()
os.execl('setup.py', *sys.argv) os.execl('setup.py', *sys.argv)