From e2a5a08b0f09bac1d60b49875dced3c636060a88 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sun, 2 Feb 2003 14:35:17 +0000 Subject: include seems to work okay now augmented/updated the regression tests * relaxng: include seems to work okay now * test/relaxng/* result/relaxng/*: augmented/updated the regression tests Daniel --- result/relaxng/tutor3_2_1.err | 4 ++-- result/relaxng/tutor3_5_2.err | 2 +- result/relaxng/tutor4_1_1 | 3 +-- result/relaxng/tutor4_1_1.err | 9 ++++++--- result/relaxng/tutor5_3_1.err | 2 +- result/relaxng/tutor6_1_3.err | 2 +- result/relaxng/tutor6_2_4.err | 2 +- result/relaxng/tutor6_3_1.err | 2 +- result/relaxng/tutor7_1_2.err | 6 +++--- result/relaxng/tutor7_1_3.err | 6 +++--- result/relaxng/tutor7_2_4.err | 4 ++-- result/relaxng/tutor7_3_4.err | 6 +++--- result/relaxng/tutor7_3_5.err | 6 +++--- result/relaxng/tutor8_2_4.err | 2 +- result/relaxng/tutor8_2_5.err | 4 ++-- result/relaxng/tutor8_2_6.err | 2 +- result/relaxng/tutor9_10_1 | 1 + result/relaxng/tutor9_10_1.err | 6 ++++++ result/relaxng/tutor9_11_1 | 1 + result/relaxng/tutor9_11_1.err | 4 ++++ result/relaxng/tutor9_12_1 | 1 + result/relaxng/tutor9_12_1.err | 4 ++++ result/relaxng/tutor9_5_2.err | 2 +- result/relaxng/tutor9_5_3.err | 2 +- result/relaxng/tutor9_6_2.err | 2 +- result/relaxng/tutor9_6_3.err | 2 +- result/relaxng/tutor9_7_1 | 1 + result/relaxng/tutor9_7_1.err | 6 ++++++ result/relaxng/tutor9_8_1 | 1 + result/relaxng/tutor9_8_1.err | 6 ++++++ result/relaxng/tutor9_9_1 | 1 + result/relaxng/tutor9_9_1.err | 5 +++++ 32 files changed, 73 insertions(+), 34 deletions(-) create mode 100644 result/relaxng/tutor9_10_1 create mode 100644 result/relaxng/tutor9_10_1.err create mode 100644 result/relaxng/tutor9_11_1 create mode 100644 result/relaxng/tutor9_11_1.err create mode 100644 result/relaxng/tutor9_12_1 create mode 100644 result/relaxng/tutor9_12_1.err create mode 100644 result/relaxng/tutor9_7_1 create mode 100644 result/relaxng/tutor9_7_1.err create mode 100644 result/relaxng/tutor9_8_1 create mode 100644 result/relaxng/tutor9_8_1.err create mode 100644 result/relaxng/tutor9_9_1 create mode 100644 result/relaxng/tutor9_9_1.err (limited to 'result') diff --git a/result/relaxng/tutor3_2_1.err b/result/relaxng/tutor3_2_1.err index 28a6d518..28f4b55c 100644 --- a/result/relaxng/tutor3_2_1.err +++ b/result/relaxng/tutor3_2_1.err @@ -1,3 +1,3 @@ -error detected at relaxng.c:4293 -error detected at relaxng.c:4341 +error detected at relaxng.c:4733 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated card : -1 diff --git a/result/relaxng/tutor3_5_2.err b/result/relaxng/tutor3_5_2.err index fc5adef9..57300245 100644 --- a/result/relaxng/tutor3_5_2.err +++ b/result/relaxng/tutor3_5_2.err @@ -1,5 +1,5 @@ xmlRelaxNGValidateAttribute(name): -1 xmlRelaxNGValidateDefinition(): validated email : 0 xmlRelaxNGValidateDefinition(): validated card : -1 -error detected at relaxng.c:4341 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated addressBook : -1 diff --git a/result/relaxng/tutor4_1_1 b/result/relaxng/tutor4_1_1 index 373a10d7..d8f436de 100644 --- a/result/relaxng/tutor4_1_1 +++ b/result/relaxng/tutor4_1_1 @@ -1,2 +1 @@ -Extra content for element addressBook -./test/relaxng/tutor4_1_1.xml validation generated an internal error +./test/relaxng/tutor4_1_1.xml validates diff --git a/result/relaxng/tutor4_1_1.err b/result/relaxng/tutor4_1_1.err index 1e44ce99..adaf345e 100644 --- a/result/relaxng/tutor4_1_1.err +++ b/result/relaxng/tutor4_1_1.err @@ -1,4 +1,7 @@ xmlRelaxNGValidateDefinition(): validated name : 0 -xmlRelaxNGValidateDefinition(): validated card : -1 -error detected at relaxng.c:4341 -xmlRelaxNGValidateDefinition(): validated addressBook : -1 +xmlRelaxNGValidateDefinition(): validated email : 0 +xmlRelaxNGValidateDefinition(): validated card : 0 +xmlRelaxNGValidateDefinition(): validated name : 0 +xmlRelaxNGValidateDefinition(): validated email : 0 +xmlRelaxNGValidateDefinition(): validated card : 0 +xmlRelaxNGValidateDefinition(): validated addressBook : 0 diff --git a/result/relaxng/tutor5_3_1.err b/result/relaxng/tutor5_3_1.err index a719419f..0e2f2568 100644 --- a/result/relaxng/tutor5_3_1.err +++ b/result/relaxng/tutor5_3_1.err @@ -1,3 +1,3 @@ -error detected at relaxng.c:4472 +error detected at relaxng.c:4910 xmlRelaxNGValidateDefinition(): validated note : 0 xmlRelaxNGValidateDefinition(): validated bad : -1 diff --git a/result/relaxng/tutor6_1_3.err b/result/relaxng/tutor6_1_3.err index bfb47f32..c11ebeda 100644 --- a/result/relaxng/tutor6_1_3.err +++ b/result/relaxng/tutor6_1_3.err @@ -1,5 +1,5 @@ xmlRelaxNGValidateAttribute(preferredFormat): -1 xmlRelaxNGValidateAttribute(email): 0 xmlRelaxNGValidateAttribute(name): 0 -error detected at relaxng.c:4349 +error detected at relaxng.c:4789 xmlRelaxNGValidateDefinition(): validated card : -1 diff --git a/result/relaxng/tutor6_2_4.err b/result/relaxng/tutor6_2_4.err index 02ace4cb..fd91c108 100644 --- a/result/relaxng/tutor6_2_4.err +++ b/result/relaxng/tutor6_2_4.err @@ -1,5 +1,5 @@ xmlRelaxNGValidateDefinition(): validated name : 0 xmlRelaxNGValidateDefinition(): validated email : 0 -error detected at relaxng.c:4341 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated preferredFormat : -1 xmlRelaxNGValidateDefinition(): validated card : -1 diff --git a/result/relaxng/tutor6_3_1.err b/result/relaxng/tutor6_3_1.err index bfb47f32..c11ebeda 100644 --- a/result/relaxng/tutor6_3_1.err +++ b/result/relaxng/tutor6_3_1.err @@ -1,5 +1,5 @@ xmlRelaxNGValidateAttribute(preferredFormat): -1 xmlRelaxNGValidateAttribute(email): 0 xmlRelaxNGValidateAttribute(name): 0 -error detected at relaxng.c:4349 +error detected at relaxng.c:4789 xmlRelaxNGValidateDefinition(): validated card : -1 diff --git a/result/relaxng/tutor7_1_2.err b/result/relaxng/tutor7_1_2.err index d31ade5c..cde76cd3 100644 --- a/result/relaxng/tutor7_1_2.err +++ b/result/relaxng/tutor7_1_2.err @@ -1,5 +1,5 @@ Unimplemented block at xmlschemastypes.c:1132 -error detected at relaxng.c:3551 -error detected at relaxng.c:4526 -error detected at relaxng.c:4341 +error detected at relaxng.c:3992 +error detected at relaxng.c:4964 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated vector : -1 diff --git a/result/relaxng/tutor7_1_3.err b/result/relaxng/tutor7_1_3.err index 1bb9ef05..c6d9ee5b 100644 --- a/result/relaxng/tutor7_1_3.err +++ b/result/relaxng/tutor7_1_3.err @@ -1,6 +1,6 @@ Unimplemented block at xmlschemastypes.c:1132 Unimplemented block at xmlschemastypes.c:1132 -error detected at relaxng.c:3739 -error detected at relaxng.c:4526 -error detected at relaxng.c:4341 +error detected at relaxng.c:4180 +error detected at relaxng.c:4964 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated vector : -1 diff --git a/result/relaxng/tutor7_2_4.err b/result/relaxng/tutor7_2_4.err index aa5e8aef..6310d77f 100644 --- a/result/relaxng/tutor7_2_4.err +++ b/result/relaxng/tutor7_2_4.err @@ -1,3 +1,3 @@ -error detected at relaxng.c:3714 -error detected at relaxng.c:4526 +error detected at relaxng.c:4155 +error detected at relaxng.c:4964 xmlRelaxNGValidateDefinition(): validated vector : -1 diff --git a/result/relaxng/tutor7_3_4.err b/result/relaxng/tutor7_3_4.err index 880a6092..74bd68f0 100644 --- a/result/relaxng/tutor7_3_4.err +++ b/result/relaxng/tutor7_3_4.err @@ -1,7 +1,7 @@ Unimplemented block at xmlschemastypes.c:1135 Unimplemented block at xmlschemastypes.c:1135 Unimplemented block at xmlschemastypes.c:1135 -error detected at relaxng.c:3739 -error detected at relaxng.c:4526 -error detected at relaxng.c:4341 +error detected at relaxng.c:4180 +error detected at relaxng.c:4964 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated path : -1 diff --git a/result/relaxng/tutor7_3_5.err b/result/relaxng/tutor7_3_5.err index b49a8a5b..d8657f5d 100644 --- a/result/relaxng/tutor7_3_5.err +++ b/result/relaxng/tutor7_3_5.err @@ -1,5 +1,5 @@ Unimplemented block at xmlschemastypes.c:1135 -error detected at relaxng.c:3551 -error detected at relaxng.c:4526 -error detected at relaxng.c:4341 +error detected at relaxng.c:3992 +error detected at relaxng.c:4964 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated path : -1 diff --git a/result/relaxng/tutor8_2_4.err b/result/relaxng/tutor8_2_4.err index bfce578a..0af92c67 100644 --- a/result/relaxng/tutor8_2_4.err +++ b/result/relaxng/tutor8_2_4.err @@ -3,5 +3,5 @@ xmlRelaxNGComputeInterleaves(interleave0) 6 groups xmlRelaxNGValidateDefinition(): validated title : 0 xmlRelaxNGValidateDefinition(): validated title : 0 -error detected at relaxng.c:4341 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated head : -1 diff --git a/result/relaxng/tutor8_2_5.err b/result/relaxng/tutor8_2_5.err index 40809094..516916b9 100644 --- a/result/relaxng/tutor8_2_5.err +++ b/result/relaxng/tutor8_2_5.err @@ -1,6 +1,6 @@ xmlRelaxNGComputeInterleaves(interleave0) 6 child 6 groups -error detected at relaxng.c:4287 -error detected at relaxng.c:4341 +error detected at relaxng.c:4727 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated head : -1 diff --git a/result/relaxng/tutor8_2_6.err b/result/relaxng/tutor8_2_6.err index 2632bfd2..871a5d5b 100644 --- a/result/relaxng/tutor8_2_6.err +++ b/result/relaxng/tutor8_2_6.err @@ -4,5 +4,5 @@ xmlRelaxNGComputeInterleaves(interleave0) xmlRelaxNGValidateDefinition(): validated title : 0 xmlRelaxNGValidateDefinition(): validated base : 0 xmlRelaxNGValidateDefinition(): validated base : 0 -error detected at relaxng.c:4341 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated head : -1 diff --git a/result/relaxng/tutor9_10_1 b/result/relaxng/tutor9_10_1 new file mode 100644 index 00000000..7c6117fa --- /dev/null +++ b/result/relaxng/tutor9_10_1 @@ -0,0 +1 @@ +./test/relaxng/tutor9_10_1.xml validates diff --git a/result/relaxng/tutor9_10_1.err b/result/relaxng/tutor9_10_1.err new file mode 100644 index 00000000..a9b23d3c --- /dev/null +++ b/result/relaxng/tutor9_10_1.err @@ -0,0 +1,6 @@ +xmlRelaxNGCheckCombine(): merging inline.extra defines: 1 +xmlRelaxNGValidateDefinition(): validated italic : 0 +xmlRelaxNGValidateDefinition(): validated em : 0 +xmlRelaxNGValidateDefinition(): validated bold : 0 +xmlRelaxNGValidateDefinition(): validated p : 0 +xmlRelaxNGValidateDefinition(): validated doc : 0 diff --git a/result/relaxng/tutor9_11_1 b/result/relaxng/tutor9_11_1 new file mode 100644 index 00000000..02a1f2a8 --- /dev/null +++ b/result/relaxng/tutor9_11_1 @@ -0,0 +1 @@ +./test/relaxng/tutor9_11_1.xml validates diff --git a/result/relaxng/tutor9_11_1.err b/result/relaxng/tutor9_11_1.err new file mode 100644 index 00000000..a06deb4e --- /dev/null +++ b/result/relaxng/tutor9_11_1.err @@ -0,0 +1,4 @@ +xmlRelaxNGValidateDefinition(): validated name : 0 +xmlRelaxNGValidateDefinition(): validated emailAddress : 0 +xmlRelaxNGValidateDefinition(): validated card : 0 +xmlRelaxNGValidateDefinition(): validated addressBook : 0 diff --git a/result/relaxng/tutor9_12_1 b/result/relaxng/tutor9_12_1 new file mode 100644 index 00000000..08f2a8a0 --- /dev/null +++ b/result/relaxng/tutor9_12_1 @@ -0,0 +1 @@ +./test/relaxng/tutor9_12_1.xml validates diff --git a/result/relaxng/tutor9_12_1.err b/result/relaxng/tutor9_12_1.err new file mode 100644 index 00000000..a06deb4e --- /dev/null +++ b/result/relaxng/tutor9_12_1.err @@ -0,0 +1,4 @@ +xmlRelaxNGValidateDefinition(): validated name : 0 +xmlRelaxNGValidateDefinition(): validated emailAddress : 0 +xmlRelaxNGValidateDefinition(): validated card : 0 +xmlRelaxNGValidateDefinition(): validated addressBook : 0 diff --git a/result/relaxng/tutor9_5_2.err b/result/relaxng/tutor9_5_2.err index 2bdc72e3..95c7ecde 100644 --- a/result/relaxng/tutor9_5_2.err +++ b/result/relaxng/tutor9_5_2.err @@ -5,5 +5,5 @@ xmlRelaxNGComputeInterleaves(interleave0) xmlRelaxNGValidateAttribute(name): 0 xmlRelaxNGValidateAttribute(email): -1 xmlRelaxNGValidateDefinition(): validated card : -1 -error detected at relaxng.c:4341 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated addressBook : -1 diff --git a/result/relaxng/tutor9_5_3.err b/result/relaxng/tutor9_5_3.err index 7aeb8b14..fdd483ae 100644 --- a/result/relaxng/tutor9_5_3.err +++ b/result/relaxng/tutor9_5_3.err @@ -5,5 +5,5 @@ xmlRelaxNGComputeInterleaves(interleave0) xmlRelaxNGValidateAttribute(name): 0 xmlRelaxNGValidateAttribute(email): 0 xmlRelaxNGValidateDefinition(): validated card : -1 -error detected at relaxng.c:4341 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated addressBook : -1 diff --git a/result/relaxng/tutor9_6_2.err b/result/relaxng/tutor9_6_2.err index bc1478c4..3c5fd73c 100644 --- a/result/relaxng/tutor9_6_2.err +++ b/result/relaxng/tutor9_6_2.err @@ -1,5 +1,5 @@ xmlRelaxNGValidateAttribute(name): 0 xmlRelaxNGValidateAttribute(email): -1 xmlRelaxNGValidateDefinition(): validated card : -1 -error detected at relaxng.c:4341 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated addressBook : -1 diff --git a/result/relaxng/tutor9_6_3.err b/result/relaxng/tutor9_6_3.err index b9bac756..3580560a 100644 --- a/result/relaxng/tutor9_6_3.err +++ b/result/relaxng/tutor9_6_3.err @@ -1,5 +1,5 @@ xmlRelaxNGValidateAttribute(name): 0 xmlRelaxNGValidateAttribute(email): 0 xmlRelaxNGValidateDefinition(): validated card : -1 -error detected at relaxng.c:4341 +error detected at relaxng.c:4781 xmlRelaxNGValidateDefinition(): validated addressBook : -1 diff --git a/result/relaxng/tutor9_7_1 b/result/relaxng/tutor9_7_1 new file mode 100644 index 00000000..00d15020 --- /dev/null +++ b/result/relaxng/tutor9_7_1 @@ -0,0 +1 @@ +./test/relaxng/tutor9_7_1.xml validates diff --git a/result/relaxng/tutor9_7_1.err b/result/relaxng/tutor9_7_1.err new file mode 100644 index 00000000..20c76cb6 --- /dev/null +++ b/result/relaxng/tutor9_7_1.err @@ -0,0 +1,6 @@ +xmlRelaxNGCheckCombine(): merging inline.class defines: 1 +xmlRelaxNGValidateDefinition(): validated italic : 0 +xmlRelaxNGValidateDefinition(): validated em : 0 +xmlRelaxNGValidateDefinition(): validated bold : 0 +xmlRelaxNGValidateDefinition(): validated p : 0 +xmlRelaxNGValidateDefinition(): validated doc : 0 diff --git a/result/relaxng/tutor9_8_1 b/result/relaxng/tutor9_8_1 new file mode 100644 index 00000000..1849f8b5 --- /dev/null +++ b/result/relaxng/tutor9_8_1 @@ -0,0 +1 @@ +./test/relaxng/tutor9_8_1.xml validates diff --git a/result/relaxng/tutor9_8_1.err b/result/relaxng/tutor9_8_1.err new file mode 100644 index 00000000..20c76cb6 --- /dev/null +++ b/result/relaxng/tutor9_8_1.err @@ -0,0 +1,6 @@ +xmlRelaxNGCheckCombine(): merging inline.class defines: 1 +xmlRelaxNGValidateDefinition(): validated italic : 0 +xmlRelaxNGValidateDefinition(): validated em : 0 +xmlRelaxNGValidateDefinition(): validated bold : 0 +xmlRelaxNGValidateDefinition(): validated p : 0 +xmlRelaxNGValidateDefinition(): validated doc : 0 diff --git a/result/relaxng/tutor9_9_1 b/result/relaxng/tutor9_9_1 new file mode 100644 index 00000000..d88f01a9 --- /dev/null +++ b/result/relaxng/tutor9_9_1 @@ -0,0 +1 @@ +./test/relaxng/tutor9_9_1.xml validates diff --git a/result/relaxng/tutor9_9_1.err b/result/relaxng/tutor9_9_1.err new file mode 100644 index 00000000..dc2c439a --- /dev/null +++ b/result/relaxng/tutor9_9_1.err @@ -0,0 +1,5 @@ +xmlRelaxNGValidateDefinition(): validated italic : 0 +xmlRelaxNGValidateDefinition(): validated em : 0 +xmlRelaxNGValidateDefinition(): validated bold : 0 +xmlRelaxNGValidateDefinition(): validated p : 0 +xmlRelaxNGValidateDefinition(): validated doc : 0 -- cgit v1.2.1