diff options
author | Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> | 2021-12-08 11:18:36 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-14 22:49:22 +0000 |
commit | 25e51ec82ac68d034054592962bb4f232c52d33d (patch) | |
tree | 3bab1c46a7328001dafb18eac29979be054d398f /meta | |
parent | 963a35872c5ad96387e13b13404284408041f40c (diff) | |
download | poky-25e51ec82ac68d034054592962bb4f232c52d33d.tar.gz |
selftest/devtool: Check branch in git fetch
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 5 |
1 files 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): | |||
442 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') | 442 | tempdir = tempfile.mkdtemp(prefix='devtoolqa') |
443 | self.track_for_cleanup(tempdir) | 443 | self.track_for_cleanup(tempdir) |
444 | url = 'gitsm://git.yoctoproject.org/mraa' | 444 | url = 'gitsm://git.yoctoproject.org/mraa' |
445 | url_branch = '%s;branch=master' % url | ||
445 | checkrev = 'ae127b19a50aa54255e4330ccfdd9a5d058e581d' | 446 | checkrev = 'ae127b19a50aa54255e4330ccfdd9a5d058e581d' |
446 | testrecipe = 'mraa' | 447 | testrecipe = 'mraa' |
447 | srcdir = os.path.join(tempdir, testrecipe) | 448 | srcdir = os.path.join(tempdir, testrecipe) |
@@ -462,7 +463,7 @@ class DevtoolAddTests(DevtoolBase): | |||
462 | checkvars = {} | 463 | checkvars = {} |
463 | checkvars['S'] = '${WORKDIR}/git' | 464 | checkvars['S'] = '${WORKDIR}/git' |
464 | checkvars['PV'] = '1.0+git${SRCPV}' | 465 | checkvars['PV'] = '1.0+git${SRCPV}' |
465 | checkvars['SRC_URI'] = url | 466 | checkvars['SRC_URI'] = url_branch |
466 | checkvars['SRCREV'] = '${AUTOREV}' | 467 | checkvars['SRCREV'] = '${AUTOREV}' |
467 | self._test_recipe_contents(recipefile, checkvars, []) | 468 | self._test_recipe_contents(recipefile, checkvars, []) |
468 | # Try with revision and version specified | 469 | # Try with revision and version specified |
@@ -481,7 +482,7 @@ class DevtoolAddTests(DevtoolBase): | |||
481 | checkvars = {} | 482 | checkvars = {} |
482 | checkvars['S'] = '${WORKDIR}/git' | 483 | checkvars['S'] = '${WORKDIR}/git' |
483 | checkvars['PV'] = '1.5+git${SRCPV}' | 484 | checkvars['PV'] = '1.5+git${SRCPV}' |
484 | checkvars['SRC_URI'] = url | 485 | checkvars['SRC_URI'] = url_branch |
485 | checkvars['SRCREV'] = checkrev | 486 | checkvars['SRCREV'] = checkrev |
486 | self._test_recipe_contents(recipefile, checkvars, []) | 487 | self._test_recipe_contents(recipefile, checkvars, []) |
487 | 488 | ||