summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-08-29 19:27:59 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 23:45:52 +0100
commite5f61f85c550646bc7e26a1fe6d9df080864ef48 (patch)
treea7251f102f44836420f32aaadebff41ddc745a4a /meta
parentbf1954c70074b1a68710487b0bdb2cd921c5b44d (diff)
downloadpoky-e5f61f85c550646bc7e26a1fe6d9df080864ef48.tar.gz
oe-selftest: devtool: fix test after recent change
OE-Core commit d3057cba0b01484712fcee3c52373c143608a436 fixed handling of wildcard bbappends, which means that this test's expectations about the bbappend file name are no longer met. devtool finish is meant to use wildcard bbappends so fix the test accordingly. (From OE-Core rev: 21603566e4a2e709dcb4a940b49d870c91c822be) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/selftest/devtool.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 08fe8df63e..e992dcf771 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -1331,7 +1331,9 @@ class DevtoolTests(DevtoolBase):
1331 result = runCmd('git status --porcelain .', cwd=recipedir) 1331 result = runCmd('git status --porcelain .', cwd=recipedir)
1332 if result.output.strip(): 1332 if result.output.strip():
1333 self.fail('Recipe directory for %s contains the following unexpected changes after finish:\n%s' % (recipe, result.output.strip())) 1333 self.fail('Recipe directory for %s contains the following unexpected changes after finish:\n%s' % (recipe, result.output.strip()))
1334 appendfile = os.path.join(appenddir, os.path.splitext(os.path.basename(oldrecipefile))[0] + '.bbappend') 1334 recipefn = os.path.splitext(os.path.basename(oldrecipefile))[0]
1335 recipefn = recipefn.split('_')[0] + '_%'
1336 appendfile = os.path.join(appenddir, recipefn + '.bbappend')
1335 self.assertTrue(os.path.exists(appendfile), 'bbappend %s should have been created but wasn\'t' % appendfile) 1337 self.assertTrue(os.path.exists(appendfile), 'bbappend %s should have been created but wasn\'t' % appendfile)
1336 newdir = os.path.join(appenddir, recipe) 1338 newdir = os.path.join(appenddir, recipe)
1337 files = os.listdir(newdir) 1339 files = os.listdir(newdir)