improved the behaviour a bit as well as the logs fixed a few more bugs
* check-xml-test-suite.py: improved the behaviour a bit as
well as the logs
* parser.c valid.c SAX.c: fixed a few more bugs
"Ran 1819 tests: 1778 suceeded, 41 failed, and 0 generated an error"
Daniel
diff --git a/check-xml-test-suite.py b/check-xml-test-suite.py
index 3bf9f9e..83546e4 100755
--- a/check-xml-test-suite.py
+++ b/check-xml-test-suite.py
@@ -17,10 +17,17 @@
# Error and warning handlers
#
error_nr = 0
+error_msg = ''
def errorHandler(ctx, str):
global error_nr
+ global error_msg
error_nr = error_nr + 1
+ if len(error_msg) < 300:
+ if len(error_msg) == 0 or error_msg[-1] == '\n':
+ error_msg = error_msg + " >>" + str
+ else:
+ error_msg = error_msg + str
libxml2.registerErrorHandler(errorHandler, None)
@@ -56,9 +63,11 @@
def testNotWf(filename, id):
global error_nr
+ global error_msg
global log
error_nr = 0
+ error_msg = ''
ctxt = libxml2.createFileParserCtxt(filename)
if ctxt == None:
@@ -75,9 +84,11 @@
def testNotWfEnt(filename, id):
global error_nr
+ global error_msg
global log
error_nr = 0
+ error_msg = ''
ctxt = libxml2.createFileParserCtxt(filename)
if ctxt == None:
@@ -95,10 +106,11 @@
def testNotWfEntDtd(filename, id):
global error_nr
+ global error_msg
global log
- error = ''
error_nr = 0
+ error_msg = ''
ctxt = libxml2.createFileParserCtxt(filename)
if ctxt == None:
@@ -117,10 +129,11 @@
def testWfEntDtd(filename, id):
global error_nr
+ global error_msg
global log
- error = ''
error_nr = 0
+ error_msg = ''
ctxt = libxml2.createFileParserCtxt(filename)
if ctxt == None:
@@ -144,9 +157,11 @@
def testInvalid(filename, id):
global error_nr
+ global error_msg
global log
error_nr = 0
+ error_msg = ''
ctxt = libxml2.createFileParserCtxt(filename)
if ctxt == None:
@@ -176,8 +191,10 @@
def testValid(filename, id):
global error_nr
+ global error_msg
error_nr = 0
+ error_msg = ''
ctxt = libxml2.createFileParserCtxt(filename)
if ctxt == None:
@@ -213,6 +230,7 @@
global test_failed
global test_error
global test_succeed
+ global error_msg
global log
uri = test.prop('URI')
@@ -269,11 +287,17 @@
# Log the ontext
if res != 1:
log.write(" File: %s\n" % (URI))
- content = test.content
+ content = string.strip(test.content)
+ while content[-1] == '\n':
+ content = content[0:-1]
if extra != None:
- log.write(" %s:%s:%s\n\n" % (type, extra, content))
+ log.write(" %s:%s:%s\n" % (type, extra, content))
else:
log.write(" %s:%s\n\n" % (type, content))
+ if error_msg != '':
+ log.write(" ----\n%s ----\n" % (error_msg))
+ error_msg = ''
+ log.write("\n")
return 0