diff options
author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-07-08 11:28:34 +0200 |
---|---|---|
committer | Laurent Bonnans <laurent.bonnans@here.com> | 2019-07-15 15:28:26 +0200 |
commit | eeaa391f3043bcf5cf3bd7645792fa6d01ee43c8 (patch) | |
tree | bbd1916152115c05aa07a6d424a57270dd603d1c /lib/oeqa/selftest/cases/updater_raspberrypi.py | |
parent | 69d8dc6ed1405a6a05faca12f482e79cb6e0471b (diff) | |
download | meta-updater-eeaa391f3043bcf5cf3bd7645792fa6d01ee43c8.tar.gz |
Factor out ugly function in oe-selftests
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
Diffstat (limited to 'lib/oeqa/selftest/cases/updater_raspberrypi.py')
-rw-r--r-- | lib/oeqa/selftest/cases/updater_raspberrypi.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/oeqa/selftest/cases/updater_raspberrypi.py b/lib/oeqa/selftest/cases/updater_raspberrypi.py index e976100..8efc941 100644 --- a/lib/oeqa/selftest/cases/updater_raspberrypi.py +++ b/lib/oeqa/selftest/cases/updater_raspberrypi.py | |||
@@ -7,6 +7,8 @@ import unittest | |||
7 | from oeqa.selftest.case import OESelftestTestCase | 7 | from oeqa.selftest.case import OESelftestTestCase |
8 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var | 8 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var |
9 | 9 | ||
10 | from testutils import metadir | ||
11 | |||
10 | 12 | ||
11 | class RpiTests(OESelftestTestCase): | 13 | class RpiTests(OESelftestTestCase): |
12 | 14 | ||
@@ -16,18 +18,13 @@ class RpiTests(OESelftestTestCase): | |||
16 | layer_rpi = "meta-raspberrypi" | 18 | layer_rpi = "meta-raspberrypi" |
17 | layer_upd_rpi = "meta-updater-raspberrypi" | 19 | layer_upd_rpi = "meta-updater-raspberrypi" |
18 | result = runCmd('bitbake-layers show-layers') | 20 | result = runCmd('bitbake-layers show-layers') |
19 | # Assume the directory layout for finding other layers. We could also | ||
20 | # make assumptions by using 'show-layers', but either way, if the | ||
21 | # layers we need aren't where we expect them, we are out of luck. | ||
22 | path = os.path.abspath(os.path.dirname(__file__)) | ||
23 | metadir = path + "/../../../../../" | ||
24 | if re.search(layer_rpi, result.output) is None: | 21 | if re.search(layer_rpi, result.output) is None: |
25 | self.meta_rpi = metadir + layer_rpi | 22 | self.meta_rpi = metadir() + layer_rpi |
26 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) | 23 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) |
27 | else: | 24 | else: |
28 | self.meta_rpi = None | 25 | self.meta_rpi = None |
29 | if re.search(layer_upd_rpi, result.output) is None: | 26 | if re.search(layer_upd_rpi, result.output) is None: |
30 | self.meta_upd_rpi = metadir + layer_upd_rpi | 27 | self.meta_upd_rpi = metadir() + layer_upd_rpi |
31 | runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi) | 28 | runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi) |
32 | else: | 29 | else: |
33 | self.meta_upd_rpi = None | 30 | self.meta_upd_rpi = None |