Skip to content
Snippets Groups Projects
Commit a3b020ce authored by Simon McVittie's avatar Simon McVittie
Browse files

tests: Make sure we have the *-inspect-library helpers


We need those to be able to deal with some graphics drivers.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 95810e75
No related branches found
No related tags found
1 merge request!200Improve how we collect DRI drivers
...@@ -207,6 +207,9 @@ class TestContainers(BaseTest): ...@@ -207,6 +207,9 @@ class TestContainers(BaseTest):
if 'PRESSURE_VESSEL_UNINSTALLED' in os.environ: if 'PRESSURE_VESSEL_UNINSTALLED' in os.environ:
os.makedirs(os.path.join(cls.pv_dir, 'bin')) os.makedirs(os.path.join(cls.pv_dir, 'bin'))
os.makedirs(
os.path.join(cls.pv_dir, 'libexec', 'steam-runtime-tools-0'),
)
for exe in ( for exe in (
'pressure-vessel-wrap', 'pressure-vessel-wrap',
...@@ -295,6 +298,45 @@ class TestContainers(BaseTest): ...@@ -295,6 +298,45 @@ class TestContainers(BaseTest):
cls.copy2(relocatable, tool_path) cls.copy2(relocatable, tool_path)
else: else:
raise unittest.SkipTest('{} not found'.format(exe)) raise unittest.SkipTest('{} not found'.format(exe))
for tool in ('inspect-library',):
exe = multiarch + '-' + tool
tool_path = os.path.join(
cls.pv_dir,
'libexec',
'steam-runtime-tools-0',
exe,
)
in_containers_dir = os.path.join(
cls.containers_dir,
'pressure-vessel',
'libexec',
'steam-runtime-tools-0',
exe,
)
if os.path.exists(in_containers_dir):
# Asssume it's a close enough version that we can
# use it with the newer pressure-vessel-wrap.
logger.info(
'Copying pre-existing %s from %s',
exe, in_containers_dir,
)
cls.copy2(
in_containers_dir,
tool_path,
)
else:
logger.info(
'Copying just-built %s from %s/pressure-vessel',
exe, cls.top_builddir,
)
cls.copy2(
os.path.join(
cls.top_builddir, 'helpers', exe,
),
tool_path,
)
else: else:
cls.pv_dir = os.path.join(cls.containers_dir, 'pressure-vessel') cls.pv_dir = os.path.join(cls.containers_dir, 'pressure-vessel')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment