Skip to content

Commit 6696c0e

Browse files
kanavinrpurdie
authored andcommitted
oeqa/sdk/assimp: run only when zlib is in the SDK
Otherwise assimp will silently fall back to a vendored copy of zlib which will fail with -D_TIME_BITS=64 due to madler/zlib#764 This was exposed by multilib mips core-image-minimal SDKs, where the default 64 bit sysroot has zlib, but 32 bit sysroot does not. (From OE-Core rev: 99911726380547a10f438e424db71d5a3d006bb1) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 parent 0be619e commit 6696c0e

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

meta/lib/oeqa/sdk/cases/assimp.py

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ def setUp(self):
2222
if not (self.tc.hasHostPackage("nativesdk-cmake") or
2323
self.tc.hasHostPackage("cmake-native")):
2424
raise unittest.SkipTest("Needs cmake")
25+
if not (self.tc.hasTargetPackage("zlib", multilib=True) or \
26+
self.tc.hasTargetPackage("libz1", multilib=True)):
27+
raise unittest.SkipTest("Assimp test needs zlib in the SDK")
2528

2629
def test_assimp(self):
2730
with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir) as testdir:

0 commit comments

Comments
 (0)