diff options
Diffstat (limited to 'lib/oeqa/selftest/cases/updater_raspberrypi.py')
-rw-r--r-- | lib/oeqa/selftest/cases/updater_raspberrypi.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/oeqa/selftest/cases/updater_raspberrypi.py b/lib/oeqa/selftest/cases/updater_raspberrypi.py index f6ae903..26d5c4c 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 | ||
@@ -17,23 +19,18 @@ class RpiTests(OESelftestTestCase): | |||
17 | layer_rpi = "meta-raspberrypi" | 19 | layer_rpi = "meta-raspberrypi" |
18 | layer_upd_rpi = "meta-updater-raspberrypi" | 20 | layer_upd_rpi = "meta-updater-raspberrypi" |
19 | result = runCmd('bitbake-layers show-layers') | 21 | result = runCmd('bitbake-layers show-layers') |
20 | # Assume the directory layout for finding other layers. We could also | ||
21 | # make assumptions by using 'show-layers', but either way, if the | ||
22 | # layers we need aren't where we expect them, we are out of luck. | ||
23 | path = os.path.abspath(os.path.dirname(__file__)) | ||
24 | metadir = path + "/../../../../../" | ||
25 | if re.search(layer_python, result.output) is None: | 22 | if re.search(layer_python, result.output) is None: |
26 | self.meta_python = metadir + layer_python | 23 | self.meta_python = metadir() + layer_python |
27 | runCmd('bitbake-layers add-layer "%s"' % self.meta_python) | 24 | runCmd('bitbake-layers add-layer "%s"' % self.meta_python) |
28 | else: | 25 | else: |
29 | self.meta_python = None | 26 | self.meta_python = None |
30 | if re.search(layer_rpi, result.output) is None: | 27 | if re.search(layer_rpi, result.output) is None: |
31 | self.meta_rpi = metadir + layer_rpi | 28 | self.meta_rpi = metadir() + layer_rpi |
32 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) | 29 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) |
33 | else: | 30 | else: |
34 | self.meta_rpi = None | 31 | self.meta_rpi = None |
35 | if re.search(layer_upd_rpi, result.output) is None: | 32 | if re.search(layer_upd_rpi, result.output) is None: |
36 | self.meta_upd_rpi = metadir + layer_upd_rpi | 33 | self.meta_upd_rpi = metadir() + layer_upd_rpi |
37 | runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi) | 34 | runCmd('bitbake-layers add-layer "%s"' % self.meta_upd_rpi) |
38 | else: | 35 | else: |
39 | self.meta_upd_rpi = None | 36 | self.meta_upd_rpi = None |