Skip to contentSkip to conversation

patch.py: Change to more strictly fuzz detection

PATCH New Naoto YAMAGUCHI 1 participant 1 message Jul 26, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 patch.py: Change to more strictly fuzz detection

From: Naoto Yamaguchi <[email protected]>

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.

---
 meta/lib/oe/patch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/patch.py +1 -1
index 7ca2e28b1f..40755fbb03 100644
@@ -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))
Signature · 1 line
2.17.1