diff options
author | Ross Burton <ross.burton@intel.com> | 2017-06-05 17:30:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-06 12:29:08 +0100 |
commit | 0fa93e1412247285c3506f0bedb1fae3ecf49257 (patch) | |
tree | ede23c1933ea821746fbe81b0352329f8ced94d4 /meta/lib | |
parent | d54e1f4ff52c330adb9ed6cca00410155c091f0c (diff) | |
download | poky-0fa93e1412247285c3506f0bedb1fae3ecf49257.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: b7a26dbca4d92b36aeb8b183e679701b5706adb0)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/selftest/recipetool.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py index 5cae8a7dbf..312684be27 100644 --- a/meta/lib/oeqa/selftest/recipetool.py +++ b/meta/lib/oeqa/selftest/recipetool.py | |||
@@ -447,8 +447,8 @@ class RecipetoolTests(RecipetoolBase): | |||
447 | temprecipe = os.path.join(self.tempdir, 'recipe') | 447 | temprecipe = os.path.join(self.tempdir, 'recipe') |
448 | os.makedirs(temprecipe) | 448 | os.makedirs(temprecipe) |
449 | recipefile = os.path.join(temprecipe, 'meson_git.bb') | 449 | recipefile = os.path.join(temprecipe, 'meson_git.bb') |
450 | srcuri = 'https://github.com/mesonbuild/meson' | 450 | srcuri = 'https://github.com/mesonbuild/meson;rev=0.32.0' |
451 | result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri)) | 451 | result = runCmd(['recipetool', 'create', '-o', temprecipe, srcuri]) |
452 | self.assertTrue(os.path.isfile(recipefile)) | 452 | self.assertTrue(os.path.isfile(recipefile)) |
453 | checkvars = {} | 453 | checkvars = {} |
454 | checkvars['LICENSE'] = set(['Apache-2.0', 'Unknown']) | 454 | checkvars['LICENSE'] = set(['Apache-2.0', 'Unknown']) |