diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 550d9de..898096c 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py | |||
@@ -206,7 +206,6 @@ class RpiTests(OESelftestTestCase): | |||
206 | def setUpLocal(self): | 206 | def setUpLocal(self): |
207 | # Add layers before changing the machine type, otherwise the sanity | 207 | # Add layers before changing the machine type, otherwise the sanity |
208 | # checker complains loudly. | 208 | # checker complains loudly. |
209 | layer_python = "meta-openembedded/meta-python" | ||
210 | layer_rpi = "meta-raspberrypi" | 209 | layer_rpi = "meta-raspberrypi" |
211 | layer_upd_rpi = "meta-updater-raspberrypi" | 210 | layer_upd_rpi = "meta-updater-raspberrypi" |
212 | result = runCmd('bitbake-layers show-layers') | 211 | result = runCmd('bitbake-layers show-layers') |
@@ -215,11 +214,6 @@ class RpiTests(OESelftestTestCase): | |||
215 | # layers we need aren't where we expect them, we are out of luck. | 214 | # layers we need aren't where we expect them, we are out of luck. |
216 | path = os.path.abspath(os.path.dirname(__file__)) | 215 | path = os.path.abspath(os.path.dirname(__file__)) |
217 | metadir = path + "/../../../../../" | 216 | metadir = path + "/../../../../../" |
218 | if re.search(layer_python, result.output) is None: | ||
219 | self.meta_python = metadir + layer_python | ||
220 | runCmd('bitbake-layers add-layer "%s"' % self.meta_python) | ||
221 | else: | ||
222 | self.meta_python = None | ||
223 | if re.search(layer_rpi, result.output) is None: | 217 | if re.search(layer_rpi, result.output) is None: |
224 | self.meta_rpi = metadir + layer_rpi | 218 | self.meta_rpi = metadir + layer_rpi |
225 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) | 219 | runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) |
@@ -255,8 +249,6 @@ class RpiTests(OESelftestTestCase): | |||
255 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) | 249 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) |
256 | if self.meta_rpi: | 250 | if self.meta_rpi: |
257 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True) | 251 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True) |
258 | if self.meta_python: | ||
259 | runCmd('bitbake-layers remove-layer "%s"' % self.meta_python, ignore_status=True) | ||
260 | 252 | ||
261 | def test_rpi(self): | 253 | def test_rpi(self): |
262 | logger = logging.getLogger("selftest") | 254 | logger = logging.getLogger("selftest") |