summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-01-03 21:32:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-07 17:45:43 +0000
commit545cde27b13f9d68211fd3a671182203ac47756d (patch)
tree6844d60e791ffd68e035156accd40b4fffa6fc45
parentf56c62b9feacd6e08fee3507185261ab3f0180e0 (diff)
downloadopenembedded-core-contrib-545cde27b13f9d68211fd3a671182203ac47756d.tar.gz
openembedded-core-contrib-545cde27b13f9d68211fd3a671182203ac47756d.tar.bz2
openembedded-core-contrib-545cde27b13f9d68211fd3a671182203ac47756d.zip
oeqa/sdk/assimp: cleanup
Unify style with the other tests. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oeqa/sdk/cases/assimp.py30
1 files changed, 16 insertions, 14 deletions
diff --git a/meta/lib/oeqa/sdk/cases/assimp.py b/meta/lib/oeqa/sdk/cases/assimp.py
index 595f383489..a600010399 100644
--- a/meta/lib/oeqa/sdk/cases/assimp.py
+++ b/meta/lib/oeqa/sdk/cases/assimp.py
@@ -1,5 +1,7 @@
-import os, subprocess, unittest
-import bb
+import os
+import subprocess
+import tempfile
+import unittest
from oeqa.sdk.case import OESDKTestCase
from oeqa.utils.subprocesstweak import errors_have_output
@@ -10,25 +12,25 @@ class BuildAssimp(OESDKTestCase):
Test case to build a project using cmake.
"""
- td_vars = ['DATETIME', 'TARGET_OS', 'TARGET_ARCH']
-
def setUp(self):
if not (self.tc.hasHostPackage("nativesdk-cmake") or
self.tc.hasHostPackage("cmake-native")):
raise unittest.SkipTest("Needs cmake")
def test_assimp(self):
- import tempfile
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")
- subprocess.check_output(["tar", "xf", tarball, "-C", testdir])
- sourcedir = os.path.join(testdir, "assimp-4.1.0")
- builddir = os.path.join(testdir, "build")
- installdir = os.path.join(testdir, "install")
- bb.utils.mkdirhier(builddir)
+ dirs = {}
+ dirs["source"] = os.path.join(testdir, "assimp-4.1.0")
+ dirs["build"] = os.path.join(testdir, "build")
+ dirs["install"] = os.path.join(testdir, "install")
+
+ subprocess.check_output(["tar", "xf", tarball, "-C", testdir])
+ self.assertTrue(os.path.isdir(dirs["source"]))
+ os.makedirs(dirs["build"])
- self._run("cd %s && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON %s " % (builddir, sourcedir))
- self._run("cmake --build %s -- -j" % builddir)
- self._run("cmake --build %s --target install -- DESTDIR=%s" % (builddir, installdir))
- self.check_elf(os.path.join(installdir, "usr", "local", "lib", "libassimp.so.4.1.0"))
+ self._run("cd {build} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON {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"))