summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-06-05 17:30:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-05 18:00:02 +0100
commit8a96509017580f02b3cd9d27d03f6e061ea4175d (patch)
treea05fc0e6030f472e50baba6cf302b4275705fb6b /meta/lib/oeqa
parent4a48386e917e29df4737c8467b8027b4e9a8b555 (diff)
downloadpoky-8a96509017580f02b3cd9d27d03f6e061ea4175d.tar.gz
oeqa/selftest: lock down Meson git revision for reliability
The test_recipetool_create_github test fetches HEAD of the repository so upstream changes can (and do) break the test. Avoid these problems by passing the rev= argument in the URL to lock the checkout to the same version that is fetched in the github_tarball test. Also pass the commands to runCmd() as a list instead of a string, the semicolon in the URL needs more quotes if the shell is involved and passing a list bypasses the shell entirely. (From OE-Core rev: cbb5961d3db27f81967345a73267920f2623ccac) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/selftest/recipetool.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py
index c3d618ff85..9b669248f6 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/meta/lib/oeqa/selftest/recipetool.py
@@ -442,8 +442,8 @@ class RecipetoolTests(RecipetoolBase):
442 temprecipe = os.path.join(self.tempdir, 'recipe') 442 temprecipe = os.path.join(self.tempdir, 'recipe')
443 os.makedirs(temprecipe) 443 os.makedirs(temprecipe)
444 recipefile = os.path.join(temprecipe, 'meson_git.bb') 444 recipefile = os.path.join(temprecipe, 'meson_git.bb')
445 srcuri = 'https://github.com/mesonbuild/meson' 445 srcuri = 'https://github.com/mesonbuild/meson;rev=0.32.0'
446 result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri)) 446 result = runCmd(['recipetool', 'create', '-o', temprecipe, srcuri])
447 self.assertTrue(os.path.isfile(recipefile)) 447 self.assertTrue(os.path.isfile(recipefile))
448 checkvars = {} 448 checkvars = {}
449 checkvars['LICENSE'] = set(['Apache-2.0']) 449 checkvars['LICENSE'] = set(['Apache-2.0'])