path: root/meta/lib
diff options
authorNaoto Yamaguchi <wata2ki@gmail.com>2020-07-27 07:39:34 +0900
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-27 19:54:00 +0100
commita8605c66ef5afe7c3583366781dfd90fe3526398 (patch)
tree49fdc29f2a403e4ad5db6ac6c9df328272c925b0 /meta/lib
parentc0b921ef38f4740212b167463c3afa9709e06f53 (diff)
patch.py: Change to more strictly fuzz detection
When applying patch subject is including a " fuzz ", do_patch_qa detect Fuzz. After the patch is applied, the following log message appears. Applying: meson: treat all fuzz cases as unit tests The current Fuzz detection checks for the presence of "fuzz" in this log message. The log in this example will be treated as Fuzz, despite its success. This patch change to more strictly fuzz detection. if log message is including " fuzz " and "Hunk " in log message, it will be treated as Fuzz. Signed-off-by: Naoto Yamaguchi <wata2ki@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 7ca2e28b1f..40755fbb03 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -41,7 +41,7 @@ def runcmd(args, dir = None):
(exitstatus, output) = subprocess.getstatusoutput(cmd)
if exitstatus != 0:
raise CmdError(cmd, exitstatus >> 8, output)
- if " fuzz " in output:
+ if " fuzz " in output and "Hunk " in output:
# Drop patch fuzz info with header and footer to log file so
# insane.bbclass can handle to throw error/warning
bb.note("--- Patch fuzz start ---\n%s\n--- Patch fuzz end ---" % format(output))