helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-09-29 14:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

selftest/devtool: Check branch in git fetch

Browse Source 
The commit 'meta/scripts: Manual git url branch additions (dc53fe75cc)'
forget the url branch= parameter in the devtool git fetch test.

(From OE-Core rev: 7d26bdcfef6473f64c73e8507bce334e010c3cad)

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Stefan Herbrechtsmeier 2021-12-08 11:18:36 +01:00 committed by Richard Purdie
parent 963a35872c
commit 25e51ec82a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/lib/oeqa/selftest/cases/devtool.py
View File

@ -442,6 +442,7 @@ class DevtoolAddTests(DevtoolBase):
tempdir = tempfile.mkdtemp(prefix='devtoolqa') tempdir = tempfile.mkdtemp(prefix='devtoolqa')
self.track_for_cleanup(tempdir) self.track_for_cleanup(tempdir)
url = 'gitsm://git.yoctoproject.org/mraa' url = 'gitsm://git.yoctoproject.org/mraa'
url_branch = '%s;branch=master' % url
checkrev = 'ae127b19a50aa54255e4330ccfdd9a5d058e581d' checkrev = 'ae127b19a50aa54255e4330ccfdd9a5d058e581d'
testrecipe = 'mraa' testrecipe = 'mraa'
srcdir = os.path.join(tempdir, testrecipe) srcdir = os.path.join(tempdir, testrecipe)
@ -462,7 +463,7 @@ class DevtoolAddTests(DevtoolBase):
checkvars = {} checkvars = {}
checkvars['S'] = '${WORKDIR}/git' checkvars['S'] = '${WORKDIR}/git'
checkvars['PV'] = '1.0+git${SRCPV}' checkvars['PV'] = '1.0+git${SRCPV}'
checkvars['SRC_URI'] = url checkvars['SRC_URI'] = url_branch
checkvars['SRCREV'] = '${AUTOREV}' checkvars['SRCREV'] = '${AUTOREV}'
self._test_recipe_contents(recipefile, checkvars, []) self._test_recipe_contents(recipefile, checkvars, [])
# Try with revision and version specified # Try with revision and version specified
@ -481,7 +482,7 @@ class DevtoolAddTests(DevtoolBase):
checkvars = {} checkvars = {}
checkvars['S'] = '${WORKDIR}/git' checkvars['S'] = '${WORKDIR}/git'
checkvars['PV'] = '1.5+git${SRCPV}' checkvars['PV'] = '1.5+git${SRCPV}'
checkvars['SRC_URI'] = url checkvars['SRC_URI'] = url_branch
checkvars['SRCREV'] = checkrev checkvars['SRCREV'] = checkrev
self._test_recipe_contents(recipefile, checkvars, []) self._test_recipe_contents(recipefile, checkvars, [])