diff options
author | Ross Burton <ross.burton@intel.com> | 2018-12-11 23:26:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-13 16:32:21 +0000 |
commit | 01bee70c315790f89ae34616d436c4f714da4514 (patch) | |
tree | f265a8b442e43c23d3836bfb97188f478fbcb01d | |
parent | 5e15b242a49ded354d23cff616365209d3f8588b (diff) | |
download | poky-01bee70c315790f89ae34616d436c4f714da4514.tar.gz |
oeqa/sdk: clean up galculator test
Drop redundant imports and variables, and use os.makedirs() instead of
bb.utils.mkdirhier().
(From OE-Core rev: 2de9b1e611e5047afb540f98756994925c22e446)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/sdk/cases/buildgalculator.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py index 7beb55884d..164a695637 100644 --- a/meta/lib/oeqa/sdk/cases/buildgalculator.py +++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py | |||
@@ -3,17 +3,14 @@ import subprocess | |||
3 | import tempfile | 3 | import tempfile |
4 | import unittest | 4 | import unittest |
5 | 5 | ||
6 | import bb | ||
7 | |||
8 | from oeqa.sdk.case import OESDKTestCase | 6 | from oeqa.sdk.case import OESDKTestCase |
9 | from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject | ||
10 | |||
11 | from oeqa.utils.subprocesstweak import errors_have_output | 7 | from oeqa.utils.subprocesstweak import errors_have_output |
12 | errors_have_output() | 8 | errors_have_output() |
13 | 9 | ||
14 | class GalculatorTest(OESDKTestCase): | 10 | class GalculatorTest(OESDKTestCase): |
15 | td_vars = ['DATETIME'] | 11 | """ |
16 | 12 | Test that autotools and GTK+ 3 compiles correctly. | |
13 | """ | ||
17 | def setUp(self): | 14 | def setUp(self): |
18 | if not (self.tc.hasTargetPackage("gtk+3", multilib=True) or \ | 15 | if not (self.tc.hasTargetPackage("gtk+3", multilib=True) or \ |
19 | self.tc.hasTargetPackage("libgtk-3.0", multilib=True)): | 16 | self.tc.hasTargetPackage("libgtk-3.0", multilib=True)): |
@@ -33,8 +30,8 @@ class GalculatorTest(OESDKTestCase): | |||
33 | 30 | ||
34 | subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) | 31 | subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) |
35 | self.assertTrue(os.path.isdir(dirs["source"])) | 32 | self.assertTrue(os.path.isdir(dirs["source"])) |
33 | os.makedirs(dirs["build"]) | ||
36 | 34 | ||
37 | bb.utils.mkdirhier(dirs["build"]) | ||
38 | self._run("cd {source} && autoreconf -i -f -I $OECORE_TARGET_SYSROOT/usr/share/aclocal -I m4".format(**dirs)) | 35 | self._run("cd {source} && autoreconf -i -f -I $OECORE_TARGET_SYSROOT/usr/share/aclocal -I m4".format(**dirs)) |
39 | self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) | 36 | self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) |
40 | self._run("cd {build} && make -j".format(**dirs)) | 37 | self._run("cd {build} && make -j".format(**dirs)) |