Merging upstream version 1.7.1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
41144a7301
commit
476f38f2bb
878 changed files with 2965 additions and 1746 deletions
|
@ -3,6 +3,16 @@ mock_ioctl = library(
|
|||
['mock.c', 'util.c'],
|
||||
)
|
||||
|
||||
# Add mock-ioctl to the LD_PRELOAD path so it overrides libc.
|
||||
# Append to LD_PRELOAD so existing libraries, e.g. libasan, are kept.
|
||||
# If libasan isn't specified in the LD_PRELOAD path, ASAN warns about mock-ioctl
|
||||
# being loaded first because its memory allocations might not get intercepted.
|
||||
# But it appears this isn't a problem; ASAN errors in mock-ioctl are reported.
|
||||
# This is likely because the executable still links with libasan before libc.
|
||||
mock_ioctl_env = environment()
|
||||
mock_ioctl_env.append('LD_PRELOAD', mock_ioctl.full_path())
|
||||
mock_ioctl_env.set('ASAN_OPTIONS', 'verify_asan_link_order=0')
|
||||
|
||||
discovery = executable(
|
||||
'test-discovery',
|
||||
'discovery.c',
|
||||
|
@ -11,7 +21,7 @@ discovery = executable(
|
|||
link_with: mock_ioctl,
|
||||
)
|
||||
|
||||
test('discovery', discovery, env: ['LD_PRELOAD=' + mock_ioctl.full_path()])
|
||||
test('discovery', discovery, env: mock_ioctl_env)
|
||||
|
||||
features = executable(
|
||||
'test-features',
|
||||
|
@ -20,7 +30,7 @@ features = executable(
|
|||
link_with: mock_ioctl,
|
||||
)
|
||||
|
||||
test('features', features, env: ['LD_PRELOAD=' + mock_ioctl.full_path()])
|
||||
test('features', features, env: mock_ioctl_env)
|
||||
|
||||
identify = executable(
|
||||
'test-identify',
|
||||
|
@ -29,4 +39,4 @@ identify = executable(
|
|||
link_with: mock_ioctl,
|
||||
)
|
||||
|
||||
test('identify', identify, env: ['LD_PRELOAD=' + mock_ioctl.full_path()])
|
||||
test('identify', identify, env: mock_ioctl_env)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue