From e733310db58160074f574c429d48f8308c0afe17 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 8 Mar 2017 10:28:10 +0100 Subject: BASELINE: Update Chromium to 56.0.2924.122 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced Reviewed-by: Michael Brüning --- chromium/third_party/libxml/src/runtest.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'chromium/third_party/libxml/src/runtest.c') diff --git a/chromium/third_party/libxml/src/runtest.c b/chromium/third_party/libxml/src/runtest.c index bb74d2a82e2..18615773228 100644 --- a/chromium/third_party/libxml/src/runtest.c +++ b/chromium/third_party/libxml/src/runtest.c @@ -2316,11 +2316,20 @@ streamMemParseTest(const char *filename, const char *result, const char *err, static FILE *xpathOutput; static xmlDocPtr xpathDocument; +static void +ignoreGenericError(void *ctx ATTRIBUTE_UNUSED, + const char *msg ATTRIBUTE_UNUSED, ...) { +} + static void testXPath(const char *str, int xptr, int expr) { + xmlGenericErrorFunc handler = ignoreGenericError; xmlXPathObjectPtr res; xmlXPathContextPtr ctxt; + /* Don't print generic errors to stderr. */ + initGenericErrorDefaultFunc(&handler); + nb_tests++; #if defined(LIBXML_XPTR_ENABLED) if (xptr) { @@ -2349,6 +2358,9 @@ testXPath(const char *str, int xptr, int expr) { xmlXPathDebugDumpObject(xpathOutput, res, 0); xmlXPathFreeObject(res); xmlXPathFreeContext(ctxt); + + /* Reset generic error handler. */ + initGenericErrorDefaultFunc(NULL); } /** -- cgit v1.2.1