summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-06-05 16:30:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-05 16:59:57 (GMT)
commitf375c30a173469f15679c47b85432634e5869db4 (patch)
tree7cc72a2a241dd9debf52a3cd8a385c88e5bcbf98
parent645467e03f338ce8a9f802745e60626e2256b1c9 (diff)
downloadpoky-f375c30a173469f15679c47b85432634e5869db4.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: 5f02b4300fb2ed54270aede54d30317ba757f587) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 7bfb02f..4344f9f 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/meta/lib/oeqa/selftest/recipetool.py
@@ -449,8 +449,8 @@ class RecipetoolTests(RecipetoolBase):
449 temprecipe = os.path.join(self.tempdir, 'recipe') 449 temprecipe = os.path.join(self.tempdir, 'recipe')
450 os.makedirs(temprecipe) 450 os.makedirs(temprecipe)
451 recipefile = os.path.join(temprecipe, 'meson_git.bb') 451 recipefile = os.path.join(temprecipe, 'meson_git.bb')
452 srcuri = 'https://github.com/mesonbuild/meson' 452 srcuri = 'https://github.com/mesonbuild/meson;rev=0.32.0'
453 result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri)) 453 result = runCmd(['recipetool', 'create', '-o', temprecipe, srcuri])
454 self.assertTrue(os.path.isfile(recipefile)) 454 self.assertTrue(os.path.isfile(recipefile))
455 checkvars = {} 455 checkvars = {}
456 checkvars['LICENSE'] = set(['Apache-2.0']) 456 checkvars['LICENSE'] = set(['Apache-2.0'])