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

Cleaner rexec logic

Browse Source
This commit is contained in:
Kovid Goyal 2021-10-04 21:12:51 +05:30
parent 47bf99c214
commit 573693a052
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/test.py
View File

@ -181,9 +181,10 @@ 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: if opts.under_sanitize and 'CALIBRE_EXECED_UNDER_SANITIZE' not in os.environ:
if 'libasan' not in os.environ.get('LD_PRELOAD', ''): 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['LD_PRELOAD'] = os.path.abspath(subprocess.check_output('gcc -print-file-name=libasan.so'.split()).decode('utf-8').strip())
os.environ['CALIBRE_EXECED_UNDER_SANITIZE'] = '1'
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 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"]}')