From: Paul Eggleton Date: Mon, 29 Aug 2016 07:27:59 +0000 (+1200) Subject: oe-selftest: devtool: fix test after recent change X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~24443 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21603566e4a2e709dcb4a940b49d870c91c822be;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 08fe8df63e0..e992dcf7712 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -1331,7 +1331,9 @@ class DevtoolTests(DevtoolBase): result = runCmd('git status --porcelain .', cwd=recipedir) if result.output.strip(): self.fail('Recipe directory for %s contains the following unexpected changes after finish:\n%s' % (recipe, result.output.strip())) - appendfile = os.path.join(appenddir, os.path.splitext(os.path.basename(oldrecipefile))[0] + '.bbappend') + recipefn = os.path.splitext(os.path.basename(oldrecipefile))[0] + recipefn = recipefn.split('_')[0] + '_%' + appendfile = os.path.join(appenddir, recipefn + '.bbappend') self.assertTrue(os.path.exists(appendfile), 'bbappend %s should have been created but wasn\'t' % appendfile) newdir = os.path.join(appenddir, recipe) files = os.listdir(newdir)