shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-10 08:58:16 +03:00
Code

More fixes to --without-valid build

Browse Source 
Fix runtest and Python bindings when building --without-valid.

The Python tests still fail. There doesn't seem to be a mechanism to
disable tests depending on feature flags.
This commit is contained in:
Nick Wellnhofer 2022-02-22 11:52:38 +01:00
parent d05317cee5
commit b057239b3f
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/libxml.c
View File

@ -1886,6 +1886,7 @@ libxml_xmlFreeParserCtxt(ATTRIBUTE_UNUSED PyObject *self, PyObject *args) {
return(Py_None); return(Py_None);
} }
#ifdef LIBXML_VALID_ENABLED
/*** /***
* xmlValidCtxt stuff * xmlValidCtxt stuff
*/ */
@ -2045,6 +2046,7 @@ libxml_xmlFreeValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
Py_INCREF(Py_None); Py_INCREF(Py_None);
return(Py_None); return(Py_None);
} }
#endif /* LIBXML_VALID_ENABLED */
#ifdef LIBXML_READER_ENABLED #ifdef LIBXML_READER_ENABLED
/************************************************************************ /************************************************************************
@ -3838,8 +3840,10 @@ static PyMethodDef libxmlMethods[] = {
{(char *) "doc", libxml_doc, METH_VARARGS, NULL}, {(char *) "doc", libxml_doc, METH_VARARGS, NULL},
{(char *) "xmlNewNode", libxml_xmlNewNode, METH_VARARGS, NULL}, {(char *) "xmlNewNode", libxml_xmlNewNode, METH_VARARGS, NULL},
{(char *) "xmlNodeRemoveNsDef", libxml_xmlNodeRemoveNsDef, METH_VARARGS, NULL}, {(char *) "xmlNodeRemoveNsDef", libxml_xmlNodeRemoveNsDef, METH_VARARGS, NULL},
#ifdef LIBXML_VALID_ENABLED
{(char *)"xmlSetValidErrors", libxml_xmlSetValidErrors, METH_VARARGS, NULL}, {(char *)"xmlSetValidErrors", libxml_xmlSetValidErrors, METH_VARARGS, NULL},
{(char *)"xmlFreeValidCtxt", libxml_xmlFreeValidCtxt, METH_VARARGS, NULL}, {(char *)"xmlFreeValidCtxt", libxml_xmlFreeValidCtxt, METH_VARARGS, NULL},
#endif /* LIBXML_VALID_ENABLED */
#ifdef LIBXML_OUTPUT_ENABLED #ifdef LIBXML_OUTPUT_ENABLED
{(char *) "serializeNode", libxml_serializeNode, METH_VARARGS, NULL}, {(char *) "serializeNode", libxml_serializeNode, METH_VARARGS, NULL},
{(char *) "saveNodeTo", libxml_saveNodeTo, METH_VARARGS, NULL}, {(char *) "saveNodeTo", libxml_saveNodeTo, METH_VARARGS, NULL},

8
runtest.c
View File

@ -2647,6 +2647,7 @@ xptrDocTest(const char *filename,
} }
#endif /* LIBXML_XPTR_ENABLED */ #endif /* LIBXML_XPTR_ENABLED */
#ifdef LIBXML_VALID_ENABLED
/** /**
* xmlidDocTest: * xmlidDocTest:
* @filename: the file to parse * @filename: the file to parse
@ -2714,6 +2715,7 @@ xmlidDocTest(const char *filename,
} }
return(res); return(res);
} }
#endif /* LIBXML_VALID_ENABLED */
#endif /* LIBXML_DEBUG_ENABLED */ #endif /* LIBXML_DEBUG_ENABLED */
#endif /* XPATH */ #endif /* XPATH */
@ -4315,6 +4317,7 @@ testDesc testDescriptions[] = {
{ "XML Namespaces regression tests", { "XML Namespaces regression tests",
errParseTest, "./test/namespaces/*", "result/namespaces/", "", ".err", errParseTest, "./test/namespaces/*", "result/namespaces/", "", ".err",
0 }, 0 },
#ifdef LIBXML_VALID_ENABLED
{ "Error cases regression tests", { "Error cases regression tests",
errParseTest, "./test/errors/*.xml", "result/errors/", "", ".err", errParseTest, "./test/errors/*.xml", "result/errors/", "", ".err",
0 }, 0 },
@ -4327,10 +4330,13 @@ testDesc testDescriptions[] = {
{ "Error cases regression tests (old 1.0)", { "Error cases regression tests (old 1.0)",
errParseTest, "./test/errors10/*.xml", "result/errors10/", "", ".err", errParseTest, "./test/errors10/*.xml", "result/errors10/", "", ".err",
XML_PARSE_OLD10 }, XML_PARSE_OLD10 },
#endif
#ifdef LIBXML_READER_ENABLED #ifdef LIBXML_READER_ENABLED
#ifdef LIBXML_VALID_ENABLED
{ "Error cases stream regression tests", { "Error cases stream regression tests",
streamParseTest, "./test/errors/*.xml", "result/errors/", NULL, ".str", streamParseTest, "./test/errors/*.xml", "result/errors/", NULL, ".str",
0 }, 0 },
#endif
{ "Reader regression tests", { "Reader regression tests",
streamParseTest, "./test/*", "result/", ".rdr", NULL, streamParseTest, "./test/*", "result/", ".rdr", NULL,
0 }, 0 },
@ -4430,10 +4436,12 @@ testDesc testDescriptions[] = {
xptrDocTest, "./test/XPath/docs/*", NULL, NULL, NULL, xptrDocTest, "./test/XPath/docs/*", NULL, NULL, NULL,
0 }, 0 },
#endif #endif
#ifdef LIBXML_VALID_ENABLED
{ "xml:id regression tests" , { "xml:id regression tests" ,
xmlidDocTest, "./test/xmlid/*", "result/xmlid/", "", ".err", xmlidDocTest, "./test/xmlid/*", "result/xmlid/", "", ".err",
0 }, 0 },
#endif #endif
#endif
#endif #endif
{ "URI parsing tests" , { "URI parsing tests" ,
uriParseTest, "./test/URI/*.uri", "result/URI/", "", NULL, uriParseTest, "./test/URI/*.uri", "result/URI/", "", NULL,