[PATCH 0/1] oeqa/sdk: assimp.py -> cmake.py

[PATCH 0/1] oeqa/sdk: assimp.py -> cmake.py

[Robert Yang]

* Test info
IMAGE_CLASSES += "testimage"

$ bitbake core-image-sato -cpopulate_sdk && bitbake core-image-sato -ctestsdk


The following changes since commit ec20e1a0e0ba61a7615b361bfc9d9dc58a91f9b3:

  create-spdx: remove trailing comma (2021-09-08 15:32:45 +0100)

are available in the Git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/test
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/test

Robert Yang (1):
  oeqa/sdk: assimp.py -> cmake.py

 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%)

-- 
2.31.1

[PATCH 1/1] oeqa/sdk: assimp.py -> cmake.py

[Robert Yang]

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.yang@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

Re: [OE-core] [PATCH 1/1] oeqa/sdk: assimp.py -> cmake.py

[Ross Burton]

On Fri, 10 Sept 2021 at 09:08, Robert Yang <liezhi.yang@windriver.com> wrote:
> -            self._run("cd {build} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON {source}".format(**dirs))
> +            self._run("cd {build} && cmake {source}".format(**dirs))

Verbose makefiles were turned on for a reason: when it breaks, we want
to see the full log.

>              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"))

Using join() but passing a hardcoded path string seems suboptimal.

Ross