* [RESEND PATCH 1/2] oeqa/selftest/devtool: abort if a local workspace already exist
@ 2023-10-24 14:17 Julien Stephan
2023-10-24 14:17 ` [RESEND PATCH 2/2] oeqa/selftest/devtool: remove spaces on empty line Julien Stephan
0 siblings, 1 reply; 4+ messages in thread
From: Julien Stephan @ 2023-10-24 14:17 UTC (permalink / raw)
To: openembedded-core; +Cc: Julien Stephan
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
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
meta/lib/oeqa/selftest/cases/devtool.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index b577f6d62a1..c36b1efa78b 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -27,6 +27,9 @@ def setUpModule():
corecopydir = os.path.join(templayerdir, 'core-copy')
bblayers_conf = os.path.join(os.environ['BUILDDIR'], 'conf', 'bblayers.conf')
edited_layers = []
+ # make sure user doesn't have a local workspace
+ result = runCmd('bitbake-layers show-layers')
+ assert "workspacelayer" not in result.output, "Devtool test suite cannot be run with a local workspace directory"
# We need to take a copy of the meta layer so we can modify it and not
# have any races against other tests that might be running in parallel
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [RESEND PATCH 2/2] oeqa/selftest/devtool: remove spaces on empty line
2023-10-24 14:17 [RESEND PATCH 1/2] oeqa/selftest/devtool: abort if a local workspace already exist Julien Stephan
@ 2023-10-24 14:17 ` Julien Stephan
2023-10-25 15:01 ` [OE-core] " Luca Ceresoli
0 siblings, 1 reply; 4+ messages in thread
From: Julien Stephan @ 2023-10-24 14:17 UTC (permalink / raw)
To: openembedded-core; +Cc: Julien Stephan
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index c36b1efa78b..b5c488be8e8 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -575,7 +575,7 @@ class DevtoolAddTests(DevtoolBase):
checkvars['S'] = '${WORKDIR}/MarkupSafe-%s' % testver
checkvars['SRC_URI'] = url
self._test_recipe_contents(recipefile, checkvars, [])
-
+
def test_devtool_add_fetch_git(self):
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
self.track_for_cleanup(tempdir)
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [OE-core] [RESEND PATCH 2/2] oeqa/selftest/devtool: remove spaces on empty line
2023-10-24 14:17 ` [RESEND PATCH 2/2] oeqa/selftest/devtool: remove spaces on empty line Julien Stephan
@ 2023-10-25 15:01 ` Luca Ceresoli
2023-10-25 16:04 ` Julien Stephan
0 siblings, 1 reply; 4+ messages in thread
From: Luca Ceresoli @ 2023-10-25 15:01 UTC (permalink / raw)
To: Julien Stephan; +Cc: openembedded-core
Hello Julien,
On Tue, 24 Oct 2023 16:17:54 +0200
"Julien Stephan" <jstephan@baylibre.com> wrote:
> Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> ---
> meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
> index c36b1efa78b..b5c488be8e8 100644
> --- a/meta/lib/oeqa/selftest/cases/devtool.py
> +++ b/meta/lib/oeqa/selftest/cases/devtool.py
> @@ -575,7 +575,7 @@ class DevtoolAddTests(DevtoolBase):
> checkvars['S'] = '${WORKDIR}/MarkupSafe-%s' % testver
> checkvars['SRC_URI'] = url
> self._test_recipe_contents(recipefile, checkvars, [])
> -
> +
This patch does not apply due to the '-' line above having no spaces
after '-'. Perhaps your mailer mangled the content removing training
whitespace (which, ironically, is what the patch itself aims at doing!).
Using 'git send-email' is usually the best way to send patches without
this sort of issues.
Luca
--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [OE-core] [RESEND PATCH 2/2] oeqa/selftest/devtool: remove spaces on empty line
2023-10-25 15:01 ` [OE-core] " Luca Ceresoli
@ 2023-10-25 16:04 ` Julien Stephan
0 siblings, 0 replies; 4+ messages in thread
From: Julien Stephan @ 2023-10-25 16:04 UTC (permalink / raw)
To: Luca Ceresoli; +Cc: openembedded-core
Le mer. 25 oct. 2023 à 17:01, Luca Ceresoli
<luca.ceresoli@bootlin.com> a écrit :
>
> Hello Julien,
>
> On Tue, 24 Oct 2023 16:17:54 +0200
> "Julien Stephan" <jstephan@baylibre.com> wrote:
>
> > Signed-off-by: Julien Stephan <jstephan@baylibre.com>
> > ---
> > meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
> > index c36b1efa78b..b5c488be8e8 100644
> > --- a/meta/lib/oeqa/selftest/cases/devtool.py
> > +++ b/meta/lib/oeqa/selftest/cases/devtool.py
> > @@ -575,7 +575,7 @@ class DevtoolAddTests(DevtoolBase):
> > checkvars['S'] = '${WORKDIR}/MarkupSafe-%s' % testver
> > checkvars['SRC_URI'] = url
> > self._test_recipe_contents(recipefile, checkvars, [])
> > -
> > +
>
> This patch does not apply due to the '-' line above having no spaces
> after '-'. Perhaps your mailer mangled the content removing training
> whitespace (which, ironically, is what the patch itself aims at doing!).
>
> Using 'git send-email' is usually the best way to send patches without
> this sort of issues.
>
Hi Luca
My editor mangled it.. I just resent it again.
Thank you
Cheers
Julien
> Luca
>
> --
> Luca Ceresoli, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-25 16:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-24 14:17 [RESEND PATCH 1/2] oeqa/selftest/devtool: abort if a local workspace already exist Julien Stephan
2023-10-24 14:17 ` [RESEND PATCH 2/2] oeqa/selftest/devtool: remove spaces on empty line Julien Stephan
2023-10-25 15:01 ` [OE-core] " Luca Ceresoli
2023-10-25 16:04 ` Julien Stephan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.