From: Naoto Yamaguchi Date: Sun, 26 Jul 2020 22:39:34 +0000 (+0900) Subject: patch.py: Change to more strictly fuzz detection X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~10461 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8605c66ef5afe7c3583366781dfd90fe3526398;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 7ca2e28b1f2..40755fbb033 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))