c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Move away from global error handlers

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-01-04 13:59:23 +01:00
parent 07c05546fa
commit 65c65b6524
5 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
runtest.c
View File

@ -1600,8 +1600,6 @@ oldParseTest(const char *filename, const char *result,
char *temp; char *temp;
int res = 0; int res = 0;
xmlSetStructuredErrorFunc(NULL, testStructuredErrorHandler);
nb_tests++; nb_tests++;
/* /*
* base of the test, parse with the old API * base of the test, parse with the old API
@ -1611,10 +1609,8 @@ oldParseTest(const char *filename, const char *result,
#else #else
doc = xmlReadFile(filename, NULL, 0); doc = xmlReadFile(filename, NULL, 0);
#endif #endif
if (doc == NULL) { if (doc == NULL)
res = 1; return(1);
goto done;
}
temp = resultFilename(filename, temp_directory, ".res"); temp = resultFilename(filename, temp_directory, ".res");
if (temp == NULL) { if (temp == NULL) {
fprintf(stderr, "out of memory\n"); fprintf(stderr, "out of memory\n");
@ -1634,10 +1630,8 @@ oldParseTest(const char *filename, const char *result,
#else #else
doc = xmlReadFile(temp, NULL, 0); doc = xmlReadFile(temp, NULL, 0);
#endif #endif
if (doc == NULL) { if (doc == NULL)
res = 1; return(1);
goto done;
}
xmlSaveFile(temp, doc); xmlSaveFile(temp, doc);
if (compareFiles(temp, result)) { if (compareFiles(temp, result)) {
res = 1; res = 1;
@ -1649,9 +1643,6 @@ oldParseTest(const char *filename, const char *result,
free(temp); free(temp);
} }
done:
xmlSetStructuredErrorFunc(NULL, NULL);
return(res); return(res);
} }
@ -4377,6 +4368,9 @@ regexpTest(const char *filename, const char *result, const char *err,
char expression[5000]; char expression[5000];
int len, ret, res = 0; int len, ret, res = 0;
/*
* TODO: Custom error handler for regexp
*/
xmlSetStructuredErrorFunc(NULL, testStructuredErrorHandler); xmlSetStructuredErrorFunc(NULL, testStructuredErrorHandler);
nb_tests++; nb_tests++;

15
runxmlconf.c
View File

@ -163,7 +163,6 @@ initializeLibxml2(void) {
*/ */
if (ctxtXPath->cache != NULL) if (ctxtXPath->cache != NULL)
xmlXPathContextSetCache(ctxtXPath, 0, -1, 0); xmlXPathContextSetCache(ctxtXPath, 0, -1, 0);
xmlSetStructuredErrorFunc(NULL, testErrorHandler);
} }
/************************************************************************ /************************************************************************
@ -184,6 +183,7 @@ xmlconfTestInvalid(const char *id, const char *filename, int options) {
id, filename); id, filename);
return(0); return(0);
} }
xmlCtxtSetErrorHandler(ctxt, testErrorHandler, NULL);
doc = xmlCtxtReadFile(ctxt, filename, NULL, options); doc = xmlCtxtReadFile(ctxt, filename, NULL, options);
if (doc == NULL) { if (doc == NULL) {
test_log("test %s : %s invalid document turned not well-formed too\n", test_log("test %s : %s invalid document turned not well-formed too\n",
@ -214,6 +214,7 @@ xmlconfTestValid(const char *id, const char *filename, int options) {
id, filename); id, filename);
return(0); return(0);
} }
xmlCtxtSetErrorHandler(ctxt, testErrorHandler, NULL);
doc = xmlCtxtReadFile(ctxt, filename, NULL, options); doc = xmlCtxtReadFile(ctxt, filename, NULL, options);
if (doc == NULL) { if (doc == NULL) {
test_log("test %s : %s failed to parse a valid document\n", test_log("test %s : %s failed to parse a valid document\n",
@ -236,14 +237,17 @@ xmlconfTestValid(const char *id, const char *filename, int options) {
static int static int
xmlconfTestNotNSWF(const char *id, const char *filename, int options) { xmlconfTestNotNSWF(const char *id, const char *filename, int options) {
xmlParserCtxtPtr ctxt;
xmlDocPtr doc; xmlDocPtr doc;
int ret = 1; int ret = 1;
ctxt = xmlNewParserCtxt();
xmlCtxtSetErrorHandler(ctxt, testErrorHandler, NULL);
/* /*
* In case of Namespace errors, libxml2 will still parse the document * In case of Namespace errors, libxml2 will still parse the document
* but log a Namespace error. * but log a Namespace error.
*/ */
doc = xmlReadFile(filename, NULL, options); doc = xmlCtxtReadFile(ctxt, filename, NULL, options);
if (doc == NULL) { if (doc == NULL) {
test_log("test %s : %s failed to parse the XML\n", test_log("test %s : %s failed to parse the XML\n",
id, filename); id, filename);
@ -261,15 +265,19 @@ xmlconfTestNotNSWF(const char *id, const char *filename, int options) {
} }
xmlFreeDoc(doc); xmlFreeDoc(doc);
} }
xmlFreeParserCtxt(ctxt);
return(ret); return(ret);
} }
static int static int
xmlconfTestNotWF(const char *id, const char *filename, int options) { xmlconfTestNotWF(const char *id, const char *filename, int options) {
xmlParserCtxtPtr ctxt;
xmlDocPtr doc; xmlDocPtr doc;
int ret = 1; int ret = 1;
doc = xmlReadFile(filename, NULL, options); ctxt = xmlNewParserCtxt();
xmlCtxtSetErrorHandler(ctxt, testErrorHandler, NULL);
doc = xmlCtxtReadFile(ctxt, filename, NULL, options);
if (doc != NULL) { if (doc != NULL) {
test_log("test %s : %s failed to detect not well formedness\n", test_log("test %s : %s failed to detect not well formedness\n",
id, filename); id, filename);
@ -277,6 +285,7 @@ xmlconfTestNotWF(const char *id, const char *filename, int options) {
xmlFreeDoc(doc); xmlFreeDoc(doc);
ret = 0; ret = 0;
} }
xmlFreeParserCtxt(ctxt);
return(ret); return(ret);
} }

1
testOOM.c
View File

@ -251,7 +251,6 @@ check_load_file_memory_func (void *data)
goto out; goto out;
xmlTextReaderSetStructuredErrorHandler (reader, error_func, NULL); xmlTextReaderSetStructuredErrorHandler (reader, error_func, NULL);
xmlSetStructuredErrorFunc(NULL, error_func);
if (valid) { if (valid) {
if (xmlTextReaderSetParserProp(reader, XML_PARSER_VALIDATE, 1) == -1) if (xmlTextReaderSetParserProp(reader, XML_PARSER_VALIDATE, 1) == -1)

10
testlimits.c
View File

@ -389,17 +389,11 @@ testExternalEntityLoader(const char *URL, const char *ID,
return(ret); return(ret);
} }
static void
testStructuredErrorHandler(void *ctx ATTRIBUTE_UNUSED,
const xmlError *err ATTRIBUTE_UNUSED) {
}
static void static void
initializeLibxml2(void) { initializeLibxml2(void) {
xmlMemSetup(xmlMemFree, xmlMemMalloc, xmlMemRealloc, xmlMemoryStrdup); xmlMemSetup(xmlMemFree, xmlMemMalloc, xmlMemRealloc, xmlMemoryStrdup);
xmlInitParser(); xmlInitParser();
xmlSetExternalEntityLoader(testExternalEntityLoader); xmlSetExternalEntityLoader(testExternalEntityLoader);
xmlSetStructuredErrorFunc(NULL, testStructuredErrorHandler);
/* /*
* register the new I/O handlers * register the new I/O handlers
*/ */
@ -999,7 +993,7 @@ saxTest(const char *filename, size_t limit, int options, int fail) {
fprintf(stderr, "Failed to create parser context\n"); fprintf(stderr, "Failed to create parser context\n");
return(1); return(1);
} }
doc = xmlCtxtReadFile(ctxt, filename, NULL, options); doc = xmlCtxtReadFile(ctxt, filename, NULL, options | XML_PARSE_NOERROR);
if (doc != NULL) { if (doc != NULL) {
fprintf(stderr, "SAX parsing generated a document !\n"); fprintf(stderr, "SAX parsing generated a document !\n");
@ -1046,7 +1040,7 @@ readerTest(const char *filename, size_t limit, int options, int fail) {
nb_tests++; nb_tests++;
maxlen = limit; maxlen = limit;
reader = xmlReaderForFile(filename , NULL, options); reader = xmlReaderForFile(filename , NULL, options | XML_PARSE_NOERROR);
if (reader == NULL) { if (reader == NULL) {
fprintf(stderr, "Failed to open '%s' test\n", filename); fprintf(stderr, "Failed to open '%s' test\n", filename);
return(1); return(1);

8
testrecurse.c
View File

@ -359,17 +359,11 @@ testExternalEntityLoader(const char *URL, const char *ID,
return(ret); return(ret);
} }
static void
testStructuredErrorHandler(void *ctx ATTRIBUTE_UNUSED,
const xmlError *err ATTRIBUTE_UNUSED) {
}
static void static void
initializeLibxml2(void) { initializeLibxml2(void) {
xmlMemSetup(xmlMemFree, xmlMemMalloc, xmlMemRealloc, xmlMemoryStrdup); xmlMemSetup(xmlMemFree, xmlMemMalloc, xmlMemRealloc, xmlMemoryStrdup);
xmlInitParser(); xmlInitParser();
xmlSetExternalEntityLoader(testExternalEntityLoader); xmlSetExternalEntityLoader(testExternalEntityLoader);
xmlSetStructuredErrorFunc(NULL, testStructuredErrorHandler);
/* /*
* register the new I/O handlers * register the new I/O handlers
*/ */
@ -485,7 +479,7 @@ recursiveDetectTest(const char *filename,
* without XML_PARSE_NOENT. The validation result doesn't matter * without XML_PARSE_NOENT. The validation result doesn't matter
* anyway. * anyway.
*/ */
int parserOptions = XML_PARSE_DTDVALID; int parserOptions = XML_PARSE_DTDVALID | XML_PARSE_NOERROR;
nb_tests++; nb_tests++;