From: Markus Lehtonen <markus.lehto...@linux.intel.com>
Number of patches in mtd-utils changed in changeset bd1aa28.
Signed-off-by: Markus Lehtonen <markus.lehto...@linux.intel.com>
---
meta/lib/oeqa/selftest/devtool.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/selftest/devtool.py
b/meta/lib/oeqa/selftest/devtool.py
index dc1cf21..aa5bd76 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -397,19 +397,26 @@ class DevtoolTests(oeSelfTest):
result = runCmd('git status . --porcelain',
cwd=os.path.dirname(recipefile))
self.assertNotEqual(result.output.strip(), "", '%s recipe should be
modified' % testrecipe)
status = result.output.splitlines()
- self.assertEqual(len(status), 3, 'Less/more files modified than
expected. Entire status:\n%s' % result.output)
+ self.assertEqual(len(status), 4, 'Less/more files modified than
expected. Entire status:\n%s' % result.output)
for line in status:
if line.endswith('add-exclusion-to-mkfs-jffs2-git-2.patch'):
self.assertEqual(line[:3], ' D ', 'Unexpected status in line:
%s' % line)
elif line.endswith('fix-armv7-neon-alignment.patch'):
self.assertEqual(line[:3], ' D ', 'Unexpected status in line:
%s' % line)
+ elif line.endswith('-duplicate-hashtable_iterator_value-.patch'):
+ self.assertEqual(line[:3], ' D ', 'Unexpected status in line:
%s' % line)
elif re.search('%s_[^_]*.bb$' % testrecipe, line):
self.assertEqual(line[:3], ' M ', 'Unexpected status in line:
%s' % line)
else:
raise AssertionError('Unexpected modified file in status: %s'
% line)
result = runCmd('git diff %s' % os.path.basename(recipefile),
cwd=os.path.dirname(recipefile))
addlines = ['SRCREV = ".*"', 'SRC_URI =
"git://git.infradead.org/mtd-utils.git"']
- removelines = ['SRCREV = ".*"', 'SRC_URI =
"git://git.infradead.org/mtd-utils.git \\\\',
'file://add-exclusion-to-mkfs-jffs2-git-2.patch \\\\',
'file://fix-armv7-neon-alignment.patch \\\\', '"']
+ removelines = ['SRCREV = ".*"',
+ 'SRC_URI = "git://git.infradead.org/mtd-utils.git \\\\',
+ 'file://add-exclusion-to-mkfs-jffs2-git-2.patch \\\\',
+ 'file://fix-armv7-neon-alignment.patch \\\\',
+
'file://0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch \\\\',
+ '"']
for line in result.output.splitlines():
if line.startswith('+++') or line.startswith('---'):
continue
--
2.1.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
