The downloaded non-free sources, now download expat-2.4.1.tar.bz2 to replace
it, and also rename the test case to cmake.py since it is used for testing
cmake.
Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
---
meta/lib/oeqa/sdk/cases/{assimp.py => cmake.py} | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
rename meta/lib/oeqa/sdk/cases/{assimp.py => cmake.py} (70%)
diff --git a/meta/lib/oeqa/sdk/cases/assimp.py
b/meta/lib/oeqa/sdk/cases/cmake.py
similarity index 70%
rename from meta/lib/oeqa/sdk/cases/assimp.py
rename to meta/lib/oeqa/sdk/cases/cmake.py
index f166758e498..13b24072109 100644
--- a/meta/lib/oeqa/sdk/cases/assimp.py
+++ b/meta/lib/oeqa/sdk/cases/cmake.py
@@ -21,12 +21,12 @@ class BuildAssimp(OESDKTestCase):
self.tc.hasHostPackage("cmake-native")):
raise unittest.SkipTest("Needs cmake")
- def test_assimp(self):
- with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir)
as testdir:
- tarball = self.fetch(testdir, self.td["DL_DIR"],
"https://github.com/assimp/assimp/archive/v4.1.0.tar.gz";)
+ def test_cmake(self):
+ with tempfile.TemporaryDirectory(prefix="cmake", dir=self.tc.sdk_dir)
as testdir:
+ tarball = self.fetch(testdir, self.td["DL_DIR"],
"https://downloads.sourceforge.net/expat/expat-2.4.1.tar.bz2";)
dirs = {}
- dirs["source"] = os.path.join(testdir, "assimp-4.1.0")
+ dirs["source"] = os.path.join(testdir, "expat-2.4.1")
dirs["build"] = os.path.join(testdir, "build")
dirs["install"] = os.path.join(testdir, "install")
@@ -34,7 +34,7 @@ class BuildAssimp(OESDKTestCase):
self.assertTrue(os.path.isdir(dirs["source"]))
os.makedirs(dirs["build"])
- self._run("cd {build} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
{source}".format(**dirs))
+ self._run("cd {build} && cmake {source}".format(**dirs))
self._run("cmake --build {build} -- -j".format(**dirs))
self._run("cmake --build {build} --target install --
DESTDIR={install}".format(**dirs))
- self.check_elf(os.path.join(dirs["install"], "usr", "local",
"lib", "libassimp.so.4.1.0"))
+ self.check_elf(os.path.join(dirs["install"],
"usr/local/lib/libexpat.so.1.8.1"))
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155897):
https://lists.openembedded.org/g/openembedded-core/message/155897
Mute This Topic: https://lists.openembedded.org/mt/85504678/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
