summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2017-03-08 17:24:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-10 14:50:10 +0000
commite663c6145a7dedbcf86430c7d66bf8da26cf778a (patch)
tree4693a3b4208f8e580ede4e7eb7c5d25789613f09
parent52c10b6e58adbdd8489ec2e491d742d942e0c53f (diff)
downloadpoky-e663c6145a7dedbcf86430c7d66bf8da26cf778a.tar.gz
lib/oeqa/selftest/oescripts: make test_cleanup_workdir use selftest-ed
Use a recipe which is bundled in the meta-selftest layer for this test, rather than relying on OE-Core remaining static (or updating the tests when OE-Core changes recipes). Tested with oe-selftest -r oescripts.TestScripts.test_cleanup_workdir (From OE-Core rev: f8aabeb1a755f3312782a7b64fe863c155510b33) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> 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/oescripts.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/lib/oeqa/selftest/oescripts.py b/meta/lib/oeqa/selftest/oescripts.py
index 28345dc6a2..baf3b6ab2c 100644
--- a/meta/lib/oeqa/selftest/oescripts.py
+++ b/meta/lib/oeqa/selftest/oescripts.py
@@ -14,10 +14,10 @@ class TestScripts(oeSelfTest):
14 14
15 @testcase(300) 15 @testcase(300)
16 def test_cleanup_workdir(self): 16 def test_cleanup_workdir(self):
17 path = os.path.dirname(get_bb_var('WORKDIR', 'gzip')) 17 path = os.path.dirname(get_bb_var('WORKDIR', 'selftest-ed'))
18 old_version_recipe = os.path.join(get_bb_var('COREBASE'), 'meta/recipes-extended/gzip/gzip_1.3.12.bb') 18 old_version_recipe = os.path.join(get_bb_var('COREBASE'), 'meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb')
19 old_version = '1.3.12' 19 old_version = '0.5'
20 bitbake("-c clean gzip") 20 bitbake("-c clean selftest-ed")
21 bitbake("-c clean -b %s" % old_version_recipe) 21 bitbake("-c clean -b %s" % old_version_recipe)
22 22
23 if os.path.exists(path): 23 if os.path.exists(path):
@@ -25,7 +25,7 @@ class TestScripts(oeSelfTest):
25 else: 25 else:
26 initial_contents = [] 26 initial_contents = []
27 27
28 bitbake('gzip') 28 bitbake('selftest-ed')
29 intermediary_contents = os.listdir(path) 29 intermediary_contents = os.listdir(path)
30 bitbake("-b %s" % old_version_recipe) 30 bitbake("-b %s" % old_version_recipe)
31 runCmd('cleanup-workdir') 31 runCmd('cleanup-workdir')