From: Daniel P. Berrangé <berrange@redhat.com>
Date: Fri, 6 Dec 2019 17:16:05 +0000 (+0000)
Subject: scripts: ignore remote protocol checks if pdwtags crashes
X-Git-Tag: v6.0.0-rc1~481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fda14dd7821d3e20b1416b90525242b7d4306fe9;p=thirdparty%2Flibvirt.git

scripts: ignore remote protocol checks if pdwtags crashes

On Debian 10, pdwtags reliably segfaults when parsing the libvirt remote
protocol files. This crash was previously ignored by 'make check'
because of the way we piped the pdwtags output to the perl
post-processing scripts. When this was converted to use python it
mistakenly started being a fatal error. We need to explicitly ignore
pdwtags output if it exited with non-zero return code.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/scripts/check-remote-protocol.py b/scripts/check-remote-protocol.py
index 201166fd9e..25caa19563 100644
--- a/scripts/check-remote-protocol.py
+++ b/scripts/check-remote-protocol.py
@@ -86,8 +86,12 @@ out, err = pdwtagsproc.communicate()
 out = out.decode("utf-8")
 err = err.decode("utf-8")
 
-if out == "" and err != "":
-    print("WARNING: no output, pdwtags appears broken:", file=sys.stderr)
+if out == "" or pdwtagsproc.returncode != 0:
+    if out == "":
+        print("WARNING: no output, pdwtags appears broken:", file=sys.stderr)
+    else:
+        print("WARNING: exit code %d, pdwtags appears broken:" %
+              pdwtagsproc.returncode, file=sys.stderr)
     for l in err.strip().split("\n"):
         print("WARNING: %s" % l, file=sys.stderr)
     print("WARNING: skipping the remote protocol test", file=sys.stderr)