summaryrefslogtreecommitdiffstats
path: root/lib/oeqa/selftest/cases/updater_minnowboard.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/oeqa/selftest/cases/updater_minnowboard.py')
-rw-r--r--lib/oeqa/selftest/cases/updater_minnowboard.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/oeqa/selftest/cases/updater_minnowboard.py b/lib/oeqa/selftest/cases/updater_minnowboard.py
index 267445b..855bd20 100644
--- a/lib/oeqa/selftest/cases/updater_minnowboard.py
+++ b/lib/oeqa/selftest/cases/updater_minnowboard.py
@@ -1,9 +1,8 @@
1import os
2import re 1import re
3 2
4from oeqa.selftest.case import OESelftestTestCase 3from oeqa.selftest.case import OESelftestTestCase
5from oeqa.utils.commands import runCmd, get_bb_var 4from oeqa.utils.commands import runCmd, get_bb_var
6from testutils import qemu_launch, qemu_send_command, qemu_terminate, verifyProvisioned 5from testutils import metadir, qemu_launch, qemu_send_command, qemu_terminate, verifyProvisioned
7 6
8 7
9class MinnowTests(OESelftestTestCase): 8class MinnowTests(OESelftestTestCase):
@@ -12,18 +11,13 @@ class MinnowTests(OESelftestTestCase):
12 layer_intel = "meta-intel" 11 layer_intel = "meta-intel"
13 layer_minnow = "meta-updater-minnowboard" 12 layer_minnow = "meta-updater-minnowboard"
14 result = runCmd('bitbake-layers show-layers') 13 result = runCmd('bitbake-layers show-layers')
15 # Assume the directory layout for finding other layers. We could also
16 # make assumptions by using 'show-layers', but either way, if the
17 # layers we need aren't where we expect them, we are out of luck.
18 path = os.path.abspath(os.path.dirname(__file__))
19 metadir = path + "/../../../../../"
20 if re.search(layer_intel, result.output) is None: 14 if re.search(layer_intel, result.output) is None:
21 self.meta_intel = metadir + layer_intel 15 self.meta_intel = metadir() + layer_intel
22 runCmd('bitbake-layers add-layer "%s"' % self.meta_intel) 16 runCmd('bitbake-layers add-layer "%s"' % self.meta_intel)
23 else: 17 else:
24 self.meta_intel = None 18 self.meta_intel = None
25 if re.search(layer_minnow, result.output) is None: 19 if re.search(layer_minnow, result.output) is None:
26 self.meta_minnow = metadir + layer_minnow 20 self.meta_minnow = metadir() + layer_minnow
27 runCmd('bitbake-layers add-layer "%s"' % self.meta_minnow) 21 runCmd('bitbake-layers add-layer "%s"' % self.meta_minnow)
28 else: 22 else:
29 self.meta_minnow = None 23 self.meta_minnow = None