From 68303f6bae4e235d12f8127f586415393b5b4e30 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Wed, 8 Jul 2020 17:17:07 +0100 Subject: [PATCH] tests: Ignore inability to load libOSMesa.so.8 This is included in prerelease versions of SteamRT 2 'soldier', but because it uses the post-gcc-5 C++ ABI of libLLVM-7.so.1, it's incompatible with versions of libLLVM-7.so.1 that were compiled to be compatible with the gcc 4 C++ ABI, and in particular the one in SteamOS 2 'brewmaster'. This and the previous commit are sufficient to make tests/containers.py pass on SteamOS 2 'brewmaster', if we also configure libxcb.so.1 to be chosen by counting symbols (T22538) and libgcc_s.so.1 to be chosen by counting verdefs (T16561). Signed-off-by: Simon McVittie <smcv@collabora.com> --- tests/inside-runtime.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/inside-runtime.py b/tests/inside-runtime.py index 3b8674bf7..a283ade91 100755 --- a/tests/inside-runtime.py +++ b/tests/inside-runtime.py @@ -409,6 +409,12 @@ class TestInsideRuntime(BaseTest): expect_library_issues |= set(details.get('issues', [])) continue + if soname == 'libOSMesa.so.8': + # T22540: C++ ABI issues around std::string in the + # ABI of libLLVM-7.so.1 + expect_library_issues |= set(details.get('issues', [])) + continue + self.assertIn('path', details) self.assertEqual( [], -- GitLab