summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJulien Stephan <jstephan@baylibre.com>2023-10-25 18:02:44 +0200
committerSteve Sakoman <steve@sakoman.com>2023-11-24 05:01:37 -1000
commit83a2a6a65efd1f7f61e38e35996d3ebd10aba1f8 (patch)
treeb28d7e1de56f245de4305b3fd1eeceaf07a0f900 /meta
parent6d424e1d0200e9bef0008f3ac405670151a5211f (diff)
downloadpoky-83a2a6a65efd1f7f61e38e35996d3ebd10aba1f8.tar.gz
oeqa/selftest/devtool: abort if a local workspace already exist
if user run devtool selftests with a local workspacelayer the tests fail with various error such as: - devtool.DevtoolAddTests.test_devtool_add just hangs - devtool.DevtoolModifyTests.* fail with the following error: ERROR: Found duplicated BBFILE_COLLECTIONS 'workspacelayer', check bblayers.conf or layer.conf to fix it. Found duplicated BBFILE_COLLECTIONS 'workspacelayer', check bblayers.conf or layer.conf to fix it. Check if a workspacelayer exists, warn the user and abort the tests (From OE-Core rev: b8756f6e20d15f1cc724784d8ceb45a969ec7f81) Signed-off-by: Julien Stephan <jstephan@baylibre.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit a74962cfb0485f6f2b9e2b751c33c8eafca8705a) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index b577f6d62a..c36b1efa78 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -27,6 +27,9 @@ def setUpModule():
27 corecopydir = os.path.join(templayerdir, 'core-copy') 27 corecopydir = os.path.join(templayerdir, 'core-copy')
28 bblayers_conf = os.path.join(os.environ['BUILDDIR'], 'conf', 'bblayers.conf') 28 bblayers_conf = os.path.join(os.environ['BUILDDIR'], 'conf', 'bblayers.conf')
29 edited_layers = [] 29 edited_layers = []
30 # make sure user doesn't have a local workspace
31 result = runCmd('bitbake-layers show-layers')
32 assert "workspacelayer" not in result.output, "Devtool test suite cannot be run with a local workspace directory"
30 33
31 # We need to take a copy of the meta layer so we can modify it and not 34 # We need to take a copy of the meta layer so we can modify it and not
32 # have any races against other tests that might be running in parallel 35 # have any races against other tests that might be running in parallel