From: Steve Sakoman <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][dunfell 09/10] selftest/devtool: Check branch in git fetch
Date: Mon, 13 Dec 2021 05:36:27 -1000 [thread overview]
Message-ID: <7d26bdcfef6473f64c73e8507bce334e010c3cad.1639409496.git.steve@sakoman.com> (raw)
In-Reply-To: <cover.1639409496.git.steve@sakoman.com>
From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
The commit 'meta/scripts: Manual git url branch additions (dc53fe75cc)'
forget the url branch= parameter in the devtool git fetch test.
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1419168a58a5caf99e24ada08c9ab639344a78b4)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/selftest/cases/devtool.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 713efd71bd..87e71632ab 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -442,6 +442,7 @@ class DevtoolAddTests(DevtoolBase):
tempdir = tempfile.mkdtemp(prefix='devtoolqa')
self.track_for_cleanup(tempdir)
url = 'gitsm://git.yoctoproject.org/mraa'
+ url_branch = '%s;branch=master' % url
checkrev = 'ae127b19a50aa54255e4330ccfdd9a5d058e581d'
testrecipe = 'mraa'
srcdir = os.path.join(tempdir, testrecipe)
@@ -462,7 +463,7 @@ class DevtoolAddTests(DevtoolBase):
checkvars = {}
checkvars['S'] = '${WORKDIR}/git'
checkvars['PV'] = '1.0+git${SRCPV}'
- checkvars['SRC_URI'] = url
+ checkvars['SRC_URI'] = url_branch
checkvars['SRCREV'] = '${AUTOREV}'
self._test_recipe_contents(recipefile, checkvars, [])
# Try with revision and version specified
@@ -481,7 +482,7 @@ class DevtoolAddTests(DevtoolBase):
checkvars = {}
checkvars['S'] = '${WORKDIR}/git'
checkvars['PV'] = '1.5+git${SRCPV}'
- checkvars['SRC_URI'] = url
+ checkvars['SRC_URI'] = url_branch
checkvars['SRCREV'] = checkrev
self._test_recipe_contents(recipefile, checkvars, [])
--
2.25.1
next prev parent reply other threads:[~2021-12-13 15:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 15:36 [OE-core][dunfell 00/10] Patch review Steve Sakoman
2021-12-13 15:36 ` [OE-core][dunfell 01/10] cve-extra-exclusions: add db CVEs to exclusion list Steve Sakoman
2021-12-13 15:36 ` [OE-core][dunfell 02/10] libgcrypt: solve CVE-2021-33560 and CVE-2021-40528 Steve Sakoman
2021-12-13 15:36 ` [OE-core][dunfell 03/10] gcc: Add CVE-2021-37322 to the list of CVEs to ignore Steve Sakoman
2021-12-13 15:36 ` [OE-core][dunfell 04/10] busybox: Fix multiple security issues in awk Steve Sakoman
2021-12-13 15:36 ` [OE-core][dunfell 05/10] wic:direct.py: ignore invalid mountpoints during fstab update Steve Sakoman
2021-12-13 15:36 ` [OE-core][dunfell 06/10] lttng-modules: do not search in non-existing folder during install Steve Sakoman
2021-12-13 15:36 ` [OE-core][dunfell 07/10] runqemu: check the qemu PID has been set before kill()ing it Steve Sakoman
2021-12-13 15:36 ` [OE-core][dunfell 08/10] recipetool: Set master branch only as fallback Steve Sakoman
2021-12-13 15:36 ` Steve Sakoman [this message]
2021-12-13 15:36 ` [OE-core][dunfell 10/10] selftest: skip virgl test on centos 8 entirely Steve Sakoman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7d26bdcfef6473f64c73e8507bce334e010c3cad.1639409496.git.steve@sakoman.com \
--to=steve@sakoman.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.