summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorNaoto Yamaguchi <wata2ki@gmail.com>2020-07-27 07:39:34 +0900
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-27 19:58:09 +0100
commit49e92f8d6d82850ea91ddd80c0cc3ebb4f4613d7 (patch)
tree8cf4646371e9781d204acef8636980a754e42f38 /meta/lib
parent3d418733ff1b1ab811295906a2a19aaf724c46fa (diff)
downloadpoky-49e92f8d6d82850ea91ddd80c0cc3ebb4f4613d7.tar.gz
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. (From OE-Core rev: a8605c66ef5afe7c3583366781dfd90fe3526398) Signed-off-by: Naoto Yamaguchi <wata2ki@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/patch.py2
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):
41 (exitstatus, output) = subprocess.getstatusoutput(cmd) 41 (exitstatus, output) = subprocess.getstatusoutput(cmd)
42 if exitstatus != 0: 42 if exitstatus != 0:
43 raise CmdError(cmd, exitstatus >> 8, output) 43 raise CmdError(cmd, exitstatus >> 8, output)
44 if " fuzz " in output: 44 if " fuzz " in output and "Hunk " in output:
45 # Drop patch fuzz info with header and footer to log file so 45 # Drop patch fuzz info with header and footer to log file so
46 # insane.bbclass can handle to throw error/warning 46 # insane.bbclass can handle to throw error/warning
47 bb.note("--- Patch fuzz start ---\n%s\n--- Patch fuzz end ---" % format(output)) 47 bb.note("--- Patch fuzz start ---\n%s\n--- Patch fuzz end ---" % format(output))