From 4ed219d64921e14b9809fd3a535f94fbe2c01d26 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 16 Oct 2009 09:48:20 +0200 Subject: Make the tests more uniform --- tests/cxx/hashmap/makefile | 4 +- tests/cxx/hashmap/output | 9 - tests/cxx/hashmap/test-000.std | 9 + tests/cxx/hybrid/binary/cdr/makefile | 4 +- tests/cxx/hybrid/binary/cdr/output.xml | 2 - tests/cxx/hybrid/binary/cdr/test-000.std | 2 + tests/cxx/hybrid/binary/cdr/test-000.xml | 93 ++++++++++ tests/cxx/hybrid/binary/cdr/test.xml | 93 ---------- tests/cxx/hybrid/binary/custom/output.xml | 2 - tests/cxx/hybrid/binary/custom/test-000.std | 2 + tests/cxx/hybrid/binary/custom/test-000.xml | 93 ++++++++++ tests/cxx/hybrid/binary/custom/test.xml | 93 ---------- tests/cxx/hybrid/binary/xdr/makefile | 4 +- tests/cxx/hybrid/binary/xdr/output.xml | 2 - tests/cxx/hybrid/binary/xdr/test-000.std | 2 + tests/cxx/hybrid/binary/xdr/test-000.xml | 93 ++++++++++ tests/cxx/hybrid/binary/xdr/test.xml | 93 ---------- tests/cxx/hybrid/built-in/makefile | 4 +- tests/cxx/hybrid/built-in/output | 5 - tests/cxx/hybrid/built-in/test-000.std | 5 + tests/cxx/hybrid/built-in/test-000.xml | 24 +++ tests/cxx/hybrid/built-in/test.xml | 24 --- tests/cxx/hybrid/choice/makefile | 4 +- tests/cxx/hybrid/choice/output | 1 - tests/cxx/hybrid/choice/test-000.std | 1 + tests/cxx/hybrid/choice/test-000.xml | 57 ++++++ tests/cxx/hybrid/choice/test.xml | 57 ------ tests/cxx/hybrid/default/makefile | 4 +- tests/cxx/hybrid/default/output | 1 - tests/cxx/hybrid/default/test-000.std | 1 + tests/cxx/hybrid/default/test-000.xml | 16 ++ tests/cxx/hybrid/default/test.xml | 16 -- tests/cxx/hybrid/list/makefile | 4 +- tests/cxx/hybrid/list/output | 1 - tests/cxx/hybrid/list/test-000.std | 1 + tests/cxx/hybrid/list/test-000.xml | 8 + tests/cxx/hybrid/list/test.xml | 8 - tests/cxx/hybrid/polymorphism/any-type/makefile | 4 +- .../cxx/hybrid/polymorphism/any-type/test-000.xml | 7 + tests/cxx/hybrid/polymorphism/any-type/test.xml | 7 - tests/cxx/hybrid/polymorphism/multischema/makefile | 4 +- tests/cxx/hybrid/polymorphism/multischema/output | 1 - .../hybrid/polymorphism/multischema/test-000.std | 1 + .../hybrid/polymorphism/multischema/test-000.xml | 7 + tests/cxx/hybrid/polymorphism/multischema/test.xml | 7 - tests/cxx/hybrid/recursive/makefile | 4 +- tests/cxx/hybrid/recursive/output | 1 - tests/cxx/hybrid/recursive/test-000.std | 1 + tests/cxx/hybrid/recursive/test-000.xml | 25 +++ tests/cxx/hybrid/recursive/test.xml | 25 --- tests/cxx/hybrid/test-template/makefile | 4 +- tests/cxx/hybrid/test-template/output | 1 - tests/cxx/hybrid/test-template/test-000.std | 1 + tests/cxx/hybrid/test-template/test-000.xml | 5 + tests/cxx/hybrid/test-template/test.xml | 5 - tests/cxx/hybrid/union/makefile | 4 +- tests/cxx/hybrid/union/output | 1 - tests/cxx/hybrid/union/test-000.std | 1 + tests/cxx/hybrid/union/test-000.xml | 6 + tests/cxx/hybrid/union/test.xml | 6 - tests/cxx/parser/built-in/makefile | 8 +- tests/cxx/parser/built-in/output-long | 167 ----------------- tests/cxx/parser/built-in/output-long-long | 167 ----------------- tests/cxx/parser/built-in/test-long-000.std | 167 +++++++++++++++++ tests/cxx/parser/built-in/test-long-000.xml | 199 +++++++++++++++++++++ tests/cxx/parser/built-in/test-long-long-000.std | 167 +++++++++++++++++ tests/cxx/parser/built-in/test-long-long-000.xml | 199 +++++++++++++++++++++ tests/cxx/parser/built-in/test-long-long.xml | 199 --------------------- tests/cxx/parser/built-in/test-long.xml | 199 --------------------- tests/cxx/parser/duplicate/makefile | 4 +- tests/cxx/parser/duplicate/output | 3 - tests/cxx/parser/duplicate/test-000.std | 3 + tests/cxx/parser/duplicate/test-000.xml | 9 + tests/cxx/parser/duplicate/test.xml | 9 - tests/cxx/parser/enumeration/makefile | 4 +- tests/cxx/parser/enumeration/output | 3 - tests/cxx/parser/enumeration/test-000.std | 3 + tests/cxx/parser/enumeration/test-000.xml | 10 ++ tests/cxx/parser/enumeration/test.xml | 10 -- tests/cxx/parser/error-handling/codes/makefile | 4 +- tests/cxx/parser/error-handling/codes/output | 15 -- tests/cxx/parser/error-handling/codes/test-000.std | 15 ++ tests/cxx/parser/error-handling/codes/test-000.xml | 9 + tests/cxx/parser/error-handling/codes/test.xml | 9 - .../cxx/parser/error-handling/exceptions/makefile | 4 +- tests/cxx/parser/error-handling/exceptions/output | 15 -- .../parser/error-handling/exceptions/test-000.std | 15 ++ .../parser/error-handling/exceptions/test-000.xml | 9 + .../cxx/parser/error-handling/exceptions/test.xml | 9 - tests/cxx/parser/generated-impl/makefile | 4 +- tests/cxx/parser/generated-impl/output | 122 ------------- tests/cxx/parser/generated-impl/test-000.std | 122 +++++++++++++ tests/cxx/parser/generated-impl/test-000.xml | 168 +++++++++++++++++ tests/cxx/parser/generated-impl/test.xml | 168 ----------------- tests/cxx/parser/list/makefile | 4 +- tests/cxx/parser/list/output | 26 --- tests/cxx/parser/list/test-000.std | 26 +++ tests/cxx/parser/list/test-000.xml | 25 +++ tests/cxx/parser/list/test.xml | 25 --- tests/cxx/parser/name-clash/inheritance/makefile | 4 +- tests/cxx/parser/name-clash/inheritance/output | 2 - .../cxx/parser/name-clash/inheritance/test-000.std | 2 + .../cxx/parser/name-clash/inheritance/test-000.xml | 8 + tests/cxx/parser/name-clash/inheritance/test.xml | 8 - tests/cxx/parser/polymorphism/makefile | 4 +- tests/cxx/parser/polymorphism/output | 14 -- tests/cxx/parser/polymorphism/test-000.std | 14 ++ tests/cxx/parser/polymorphism/test-000.xml | 19 ++ tests/cxx/parser/polymorphism/test.xml | 19 -- tests/cxx/parser/recursive/makefile | 4 +- tests/cxx/parser/recursive/output | 22 --- tests/cxx/parser/recursive/test-000.std | 22 +++ tests/cxx/parser/recursive/test-000.xml | 11 ++ tests/cxx/parser/recursive/test.xml | 11 -- tests/cxx/parser/reset/makefile | 4 +- tests/cxx/parser/reset/output | 8 - tests/cxx/parser/reset/test.std | 8 + tests/cxx/parser/test-template/makefile | 4 +- tests/cxx/parser/test-template/output | 1 - tests/cxx/parser/test-template/test-000.std | 1 + tests/cxx/parser/test-template/test-000.xml | 7 + tests/cxx/parser/test-template/test.xml | 7 - tests/cxx/parser/union/makefile | 4 +- tests/cxx/parser/union/output | 3 - tests/cxx/parser/union/test-000.std | 3 + tests/cxx/parser/union/test-000.xml | 10 ++ tests/cxx/parser/union/test.xml | 10 -- tests/cxx/parser/validation/attribute/makefile | 4 +- tests/cxx/parser/validation/attribute/output | 24 --- tests/cxx/parser/validation/attribute/test-000.std | 24 +++ tests/cxx/parser/validation/attribute/test-000.xml | 10 ++ tests/cxx/parser/validation/attribute/test.xml | 10 -- tests/cxx/serializer/all/makefile | 4 +- tests/cxx/serializer/all/output | 1 - tests/cxx/serializer/all/test-000.std | 1 + tests/cxx/serializer/choice/makefile | 4 +- tests/cxx/serializer/choice/output | 1 - tests/cxx/serializer/choice/test-000.std | 1 + tests/cxx/serializer/complex/makefile | 4 +- tests/cxx/serializer/complex/output | 1 - tests/cxx/serializer/complex/test-000.std | 1 + tests/cxx/serializer/enumeration/makefile | 4 +- tests/cxx/serializer/enumeration/output | 1 - tests/cxx/serializer/enumeration/test-000.std | 1 + tests/cxx/serializer/error-handling/codes/makefile | 4 +- tests/cxx/serializer/error-handling/codes/output | 20 --- .../serializer/error-handling/codes/test-000.std | 20 +++ .../serializer/error-handling/exceptions/makefile | 4 +- .../serializer/error-handling/exceptions/output | 20 --- .../error-handling/exceptions/test-000.std | 20 +++ tests/cxx/serializer/generated-driver/makefile | 4 +- tests/cxx/serializer/generated-driver/output | 1 - tests/cxx/serializer/generated-driver/test-000.std | 1 + tests/cxx/serializer/list/makefile | 4 +- tests/cxx/serializer/list/output | 1 - tests/cxx/serializer/list/test-000.std | 1 + tests/cxx/serializer/polymorphism/makefile | 4 +- tests/cxx/serializer/polymorphism/output | 1 - tests/cxx/serializer/polymorphism/test-000.std | 1 + tests/cxx/serializer/recursive/makefile | 4 +- tests/cxx/serializer/recursive/output | 1 - tests/cxx/serializer/recursive/test-000.std | 1 + tests/cxx/serializer/reset/makefile | 4 +- tests/cxx/serializer/reset/output | 7 - tests/cxx/serializer/reset/test-000.std | 7 + tests/cxx/serializer/restriction/makefile | 4 +- tests/cxx/serializer/restriction/output | 1 - tests/cxx/serializer/restriction/test-000.std | 1 + tests/cxx/serializer/sequence/makefile | 4 +- tests/cxx/serializer/sequence/output | 1 - tests/cxx/serializer/sequence/test-000.std | 1 + tests/cxx/serializer/test-template/makefile | 4 +- tests/cxx/serializer/test-template/output | 1 - tests/cxx/serializer/test-template/test-000.std | 1 + tests/cxx/serializer/union/makefile | 4 +- tests/cxx/serializer/union/output | 1 - tests/cxx/serializer/union/test-000.std | 1 + tests/cxx/serializer/validation/any/makefile | 4 +- tests/cxx/serializer/validation/any/output | 9 - tests/cxx/serializer/validation/any/test-000.std | 9 + .../cxx/serializer/validation/attribute/driver.cxx | 6 +- tests/cxx/serializer/validation/attribute/makefile | 4 +- tests/cxx/serializer/validation/attribute/output | 9 - .../serializer/validation/attribute/test-000.std | 9 + tests/cxx/serializer/validation/choice/makefile | 4 +- tests/cxx/serializer/validation/choice/output | 2 - .../cxx/serializer/validation/choice/test-000.std | 2 + tests/cxx/serializer/validation/element/makefile | 4 +- tests/cxx/serializer/validation/element/output | 2 - .../cxx/serializer/validation/element/test-000.std | 2 + tests/cxx/serializer/validation/sequence/makefile | 4 +- tests/cxx/serializer/validation/sequence/output | 1 - .../serializer/validation/sequence/test-000.std | 1 + tests/cxx/serializer/wildcard/driver.cxx | 7 + tests/cxx/serializer/wildcard/makefile | 4 +- tests/cxx/serializer/wildcard/output | 1 - tests/cxx/serializer/wildcard/test-000.std | 1 + 197 files changed, 1937 insertions(+), 1926 deletions(-) delete mode 100644 tests/cxx/hashmap/output create mode 100644 tests/cxx/hashmap/test-000.std delete mode 100644 tests/cxx/hybrid/binary/cdr/output.xml create mode 100644 tests/cxx/hybrid/binary/cdr/test-000.std create mode 100644 tests/cxx/hybrid/binary/cdr/test-000.xml delete mode 100644 tests/cxx/hybrid/binary/cdr/test.xml delete mode 100644 tests/cxx/hybrid/binary/custom/output.xml create mode 100644 tests/cxx/hybrid/binary/custom/test-000.std create mode 100644 tests/cxx/hybrid/binary/custom/test-000.xml delete mode 100644 tests/cxx/hybrid/binary/custom/test.xml delete mode 100644 tests/cxx/hybrid/binary/xdr/output.xml create mode 100644 tests/cxx/hybrid/binary/xdr/test-000.std create mode 100644 tests/cxx/hybrid/binary/xdr/test-000.xml delete mode 100644 tests/cxx/hybrid/binary/xdr/test.xml delete mode 100644 tests/cxx/hybrid/built-in/output create mode 100644 tests/cxx/hybrid/built-in/test-000.std create mode 100644 tests/cxx/hybrid/built-in/test-000.xml delete mode 100644 tests/cxx/hybrid/built-in/test.xml delete mode 100644 tests/cxx/hybrid/choice/output create mode 100644 tests/cxx/hybrid/choice/test-000.std create mode 100644 tests/cxx/hybrid/choice/test-000.xml delete mode 100644 tests/cxx/hybrid/choice/test.xml delete mode 100644 tests/cxx/hybrid/default/output create mode 100644 tests/cxx/hybrid/default/test-000.std create mode 100644 tests/cxx/hybrid/default/test-000.xml delete mode 100644 tests/cxx/hybrid/default/test.xml delete mode 100644 tests/cxx/hybrid/list/output create mode 100644 tests/cxx/hybrid/list/test-000.std create mode 100644 tests/cxx/hybrid/list/test-000.xml delete mode 100644 tests/cxx/hybrid/list/test.xml create mode 100644 tests/cxx/hybrid/polymorphism/any-type/test-000.xml delete mode 100644 tests/cxx/hybrid/polymorphism/any-type/test.xml delete mode 100644 tests/cxx/hybrid/polymorphism/multischema/output create mode 100644 tests/cxx/hybrid/polymorphism/multischema/test-000.std create mode 100644 tests/cxx/hybrid/polymorphism/multischema/test-000.xml delete mode 100644 tests/cxx/hybrid/polymorphism/multischema/test.xml delete mode 100644 tests/cxx/hybrid/recursive/output create mode 100644 tests/cxx/hybrid/recursive/test-000.std create mode 100644 tests/cxx/hybrid/recursive/test-000.xml delete mode 100644 tests/cxx/hybrid/recursive/test.xml delete mode 100644 tests/cxx/hybrid/test-template/output create mode 100644 tests/cxx/hybrid/test-template/test-000.std create mode 100644 tests/cxx/hybrid/test-template/test-000.xml delete mode 100644 tests/cxx/hybrid/test-template/test.xml delete mode 100644 tests/cxx/hybrid/union/output create mode 100644 tests/cxx/hybrid/union/test-000.std create mode 100644 tests/cxx/hybrid/union/test-000.xml delete mode 100644 tests/cxx/hybrid/union/test.xml delete mode 100644 tests/cxx/parser/built-in/output-long delete mode 100644 tests/cxx/parser/built-in/output-long-long create mode 100644 tests/cxx/parser/built-in/test-long-000.std create mode 100644 tests/cxx/parser/built-in/test-long-000.xml create mode 100644 tests/cxx/parser/built-in/test-long-long-000.std create mode 100644 tests/cxx/parser/built-in/test-long-long-000.xml delete mode 100644 tests/cxx/parser/built-in/test-long-long.xml delete mode 100644 tests/cxx/parser/built-in/test-long.xml delete mode 100644 tests/cxx/parser/duplicate/output create mode 100644 tests/cxx/parser/duplicate/test-000.std create mode 100644 tests/cxx/parser/duplicate/test-000.xml delete mode 100644 tests/cxx/parser/duplicate/test.xml delete mode 100644 tests/cxx/parser/enumeration/output create mode 100644 tests/cxx/parser/enumeration/test-000.std create mode 100644 tests/cxx/parser/enumeration/test-000.xml delete mode 100644 tests/cxx/parser/enumeration/test.xml delete mode 100644 tests/cxx/parser/error-handling/codes/output create mode 100644 tests/cxx/parser/error-handling/codes/test-000.std create mode 100644 tests/cxx/parser/error-handling/codes/test-000.xml delete mode 100644 tests/cxx/parser/error-handling/codes/test.xml delete mode 100644 tests/cxx/parser/error-handling/exceptions/output create mode 100644 tests/cxx/parser/error-handling/exceptions/test-000.std create mode 100644 tests/cxx/parser/error-handling/exceptions/test-000.xml delete mode 100644 tests/cxx/parser/error-handling/exceptions/test.xml delete mode 100644 tests/cxx/parser/generated-impl/output create mode 100644 tests/cxx/parser/generated-impl/test-000.std create mode 100644 tests/cxx/parser/generated-impl/test-000.xml delete mode 100644 tests/cxx/parser/generated-impl/test.xml delete mode 100644 tests/cxx/parser/list/output create mode 100644 tests/cxx/parser/list/test-000.std create mode 100644 tests/cxx/parser/list/test-000.xml delete mode 100644 tests/cxx/parser/list/test.xml delete mode 100644 tests/cxx/parser/name-clash/inheritance/output create mode 100644 tests/cxx/parser/name-clash/inheritance/test-000.std create mode 100644 tests/cxx/parser/name-clash/inheritance/test-000.xml delete mode 100644 tests/cxx/parser/name-clash/inheritance/test.xml delete mode 100644 tests/cxx/parser/polymorphism/output create mode 100644 tests/cxx/parser/polymorphism/test-000.std create mode 100644 tests/cxx/parser/polymorphism/test-000.xml delete mode 100644 tests/cxx/parser/polymorphism/test.xml delete mode 100644 tests/cxx/parser/recursive/output create mode 100644 tests/cxx/parser/recursive/test-000.std create mode 100644 tests/cxx/parser/recursive/test-000.xml delete mode 100644 tests/cxx/parser/recursive/test.xml delete mode 100644 tests/cxx/parser/reset/output create mode 100644 tests/cxx/parser/reset/test.std delete mode 100644 tests/cxx/parser/test-template/output create mode 100644 tests/cxx/parser/test-template/test-000.std create mode 100644 tests/cxx/parser/test-template/test-000.xml delete mode 100644 tests/cxx/parser/test-template/test.xml delete mode 100644 tests/cxx/parser/union/output create mode 100644 tests/cxx/parser/union/test-000.std create mode 100644 tests/cxx/parser/union/test-000.xml delete mode 100644 tests/cxx/parser/union/test.xml delete mode 100644 tests/cxx/parser/validation/attribute/output create mode 100644 tests/cxx/parser/validation/attribute/test-000.std create mode 100644 tests/cxx/parser/validation/attribute/test-000.xml delete mode 100644 tests/cxx/parser/validation/attribute/test.xml delete mode 100644 tests/cxx/serializer/all/output create mode 100644 tests/cxx/serializer/all/test-000.std delete mode 100644 tests/cxx/serializer/choice/output create mode 100644 tests/cxx/serializer/choice/test-000.std delete mode 100644 tests/cxx/serializer/complex/output create mode 100644 tests/cxx/serializer/complex/test-000.std delete mode 100644 tests/cxx/serializer/enumeration/output create mode 100644 tests/cxx/serializer/enumeration/test-000.std delete mode 100644 tests/cxx/serializer/error-handling/codes/output create mode 100644 tests/cxx/serializer/error-handling/codes/test-000.std delete mode 100644 tests/cxx/serializer/error-handling/exceptions/output create mode 100644 tests/cxx/serializer/error-handling/exceptions/test-000.std delete mode 100644 tests/cxx/serializer/generated-driver/output create mode 100644 tests/cxx/serializer/generated-driver/test-000.std delete mode 100644 tests/cxx/serializer/list/output create mode 100644 tests/cxx/serializer/list/test-000.std delete mode 100644 tests/cxx/serializer/polymorphism/output create mode 100644 tests/cxx/serializer/polymorphism/test-000.std delete mode 100644 tests/cxx/serializer/recursive/output create mode 100644 tests/cxx/serializer/recursive/test-000.std delete mode 100644 tests/cxx/serializer/reset/output create mode 100644 tests/cxx/serializer/reset/test-000.std delete mode 100644 tests/cxx/serializer/restriction/output create mode 100644 tests/cxx/serializer/restriction/test-000.std delete mode 100644 tests/cxx/serializer/sequence/output create mode 100644 tests/cxx/serializer/sequence/test-000.std delete mode 100644 tests/cxx/serializer/test-template/output create mode 100644 tests/cxx/serializer/test-template/test-000.std delete mode 100644 tests/cxx/serializer/union/output create mode 100644 tests/cxx/serializer/union/test-000.std delete mode 100644 tests/cxx/serializer/validation/any/output create mode 100644 tests/cxx/serializer/validation/any/test-000.std delete mode 100644 tests/cxx/serializer/validation/attribute/output create mode 100644 tests/cxx/serializer/validation/attribute/test-000.std delete mode 100644 tests/cxx/serializer/validation/choice/output create mode 100644 tests/cxx/serializer/validation/choice/test-000.std delete mode 100644 tests/cxx/serializer/validation/element/output create mode 100644 tests/cxx/serializer/validation/element/test-000.std delete mode 100644 tests/cxx/serializer/validation/sequence/output create mode 100644 tests/cxx/serializer/validation/sequence/test-000.std delete mode 100644 tests/cxx/serializer/wildcard/output create mode 100644 tests/cxx/serializer/wildcard/test-000.std (limited to 'tests/cxx') diff --git a/tests/cxx/hashmap/makefile b/tests/cxx/hashmap/makefile index d3f3c36..6334dc2 100644 --- a/tests/cxx/hashmap/makefile +++ b/tests/cxx/hashmap/makefile @@ -34,8 +34,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hashmap/output b/tests/cxx/hashmap/output deleted file mode 100644 index 295e6da..0000000 --- a/tests/cxx/hashmap/output +++ /dev/null @@ -1,9 +0,0 @@ -'1' -'4' -'2' -'9' -'3' -'8' -'5' -'6' -'7' diff --git a/tests/cxx/hashmap/test-000.std b/tests/cxx/hashmap/test-000.std new file mode 100644 index 0000000..295e6da --- /dev/null +++ b/tests/cxx/hashmap/test-000.std @@ -0,0 +1,9 @@ +'1' +'4' +'2' +'9' +'3' +'8' +'5' +'6' +'7' diff --git a/tests/cxx/hybrid/binary/cdr/makefile b/tests/cxx/hybrid/binary/cdr/makefile index c64fbb5..f5fa36f 100644 --- a/tests/cxx/hybrid/binary/cdr/makefile +++ b/tests/cxx/hybrid/binary/cdr/makefile @@ -54,8 +54,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output.xml - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output.xml -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/binary/cdr/output.xml b/tests/cxx/hybrid/binary/cdr/output.xml deleted file mode 100644 index f36f755..0000000 --- a/tests/cxx/hybrid/binary/cdr/output.xml +++ /dev/null @@ -1,2 +0,0 @@ -1 2 3abcleftaaaaaabbbcccccc123abcdef12.34false6566-22257005-570053735928559-21474836482147483647-2147483648-214748364821474836472147483647-2147483648true1234.1212345678.12345681234567812345678stringnormalized stringone two threenamename-tokenname tokensncnameen-usxsi:schemaLocationelements1elements2elements1elements1 elements2http://www.codesynthesis.comYmFzZTY0IGJpbmFyeQ== -6865782052696E6172792001-10-26+02:002001-10-26T21:32:52+02:00P1Y2M3DT5H20M30S---01+02:00--11+02:00--02-11+02:002001+02:002001-11+02:00 \ No newline at end of file diff --git a/tests/cxx/hybrid/binary/cdr/test-000.std b/tests/cxx/hybrid/binary/cdr/test-000.std new file mode 100644 index 0000000..f36f755 --- /dev/null +++ b/tests/cxx/hybrid/binary/cdr/test-000.std @@ -0,0 +1,2 @@ +1 2 3abcleftaaaaaabbbcccccc123abcdef12.34false6566-22257005-570053735928559-21474836482147483647-2147483648-214748364821474836472147483647-2147483648true1234.1212345678.12345681234567812345678stringnormalized stringone two threenamename-tokenname tokensncnameen-usxsi:schemaLocationelements1elements2elements1elements1 elements2http://www.codesynthesis.comYmFzZTY0IGJpbmFyeQ== +6865782052696E6172792001-10-26+02:002001-10-26T21:32:52+02:00P1Y2M3DT5H20M30S---01+02:00--11+02:00--02-11+02:002001+02:002001-11+02:00 \ No newline at end of file diff --git a/tests/cxx/hybrid/binary/cdr/test-000.xml b/tests/cxx/hybrid/binary/cdr/test-000.xml new file mode 100644 index 0000000..1218c37 --- /dev/null +++ b/tests/cxx/hybrid/binary/cdr/test-000.xml @@ -0,0 +1,93 @@ + + + 1 2 3 + + abc + + left + + + aaa + + + aaa + bbb + c + cc + ccc + + + + 123 + abcdef + 12.34false + + + 65 + 66 + -222 + 57005 + -57005 + 3735928559 + -2147483648 + 2147483647 + -2147483648 + -2147483648 + 2147483647 + 2147483647 + -2147483648 + + + + true + + + + 1234.1234 + 12345678.12345678 + 1234567812345678.1234567812345678 + + + + string + normalized string + one two three + name + name-token + name tokens + ncname + en-us + + + xsi:schemaLocation + + + + elements1 + elements2 + elements1 + elements1 elements2 + + + + http://www.codesynthesis.com + + + + YmFzZTY0IGJpbmFyeQ== + 6865782052696E617279 + + + + 2001-10-26+02:00 + 2001-10-26T21:32:52+02:00 + P1Y2M3DT5H20M30S + ---01+02:00 + --11+02:00 + --11-02+02:00 + 2001+02:00 + 2001-11+02:00 + + + + diff --git a/tests/cxx/hybrid/binary/cdr/test.xml b/tests/cxx/hybrid/binary/cdr/test.xml deleted file mode 100644 index 1218c37..0000000 --- a/tests/cxx/hybrid/binary/cdr/test.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - 1 2 3 - - abc - - left - - - aaa - - - aaa - bbb - c - cc - ccc - - - - 123 - abcdef - 12.34false - - - 65 - 66 - -222 - 57005 - -57005 - 3735928559 - -2147483648 - 2147483647 - -2147483648 - -2147483648 - 2147483647 - 2147483647 - -2147483648 - - - - true - - - - 1234.1234 - 12345678.12345678 - 1234567812345678.1234567812345678 - - - - string - normalized string - one two three - name - name-token - name tokens - ncname - en-us - - - xsi:schemaLocation - - - - elements1 - elements2 - elements1 - elements1 elements2 - - - - http://www.codesynthesis.com - - - - YmFzZTY0IGJpbmFyeQ== - 6865782052696E617279 - - - - 2001-10-26+02:00 - 2001-10-26T21:32:52+02:00 - P1Y2M3DT5H20M30S - ---01+02:00 - --11+02:00 - --11-02+02:00 - 2001+02:00 - 2001-11+02:00 - - - - diff --git a/tests/cxx/hybrid/binary/custom/output.xml b/tests/cxx/hybrid/binary/custom/output.xml deleted file mode 100644 index f36f755..0000000 --- a/tests/cxx/hybrid/binary/custom/output.xml +++ /dev/null @@ -1,2 +0,0 @@ -1 2 3abcleftaaaaaabbbcccccc123abcdef12.34false6566-22257005-570053735928559-21474836482147483647-2147483648-214748364821474836472147483647-2147483648true1234.1212345678.12345681234567812345678stringnormalized stringone two threenamename-tokenname tokensncnameen-usxsi:schemaLocationelements1elements2elements1elements1 elements2http://www.codesynthesis.comYmFzZTY0IGJpbmFyeQ== -6865782052696E6172792001-10-26+02:002001-10-26T21:32:52+02:00P1Y2M3DT5H20M30S---01+02:00--11+02:00--02-11+02:002001+02:002001-11+02:00 \ No newline at end of file diff --git a/tests/cxx/hybrid/binary/custom/test-000.std b/tests/cxx/hybrid/binary/custom/test-000.std new file mode 100644 index 0000000..f36f755 --- /dev/null +++ b/tests/cxx/hybrid/binary/custom/test-000.std @@ -0,0 +1,2 @@ +1 2 3abcleftaaaaaabbbcccccc123abcdef12.34false6566-22257005-570053735928559-21474836482147483647-2147483648-214748364821474836472147483647-2147483648true1234.1212345678.12345681234567812345678stringnormalized stringone two threenamename-tokenname tokensncnameen-usxsi:schemaLocationelements1elements2elements1elements1 elements2http://www.codesynthesis.comYmFzZTY0IGJpbmFyeQ== +6865782052696E6172792001-10-26+02:002001-10-26T21:32:52+02:00P1Y2M3DT5H20M30S---01+02:00--11+02:00--02-11+02:002001+02:002001-11+02:00 \ No newline at end of file diff --git a/tests/cxx/hybrid/binary/custom/test-000.xml b/tests/cxx/hybrid/binary/custom/test-000.xml new file mode 100644 index 0000000..1218c37 --- /dev/null +++ b/tests/cxx/hybrid/binary/custom/test-000.xml @@ -0,0 +1,93 @@ + + + 1 2 3 + + abc + + left + + + aaa + + + aaa + bbb + c + cc + ccc + + + + 123 + abcdef + 12.34false + + + 65 + 66 + -222 + 57005 + -57005 + 3735928559 + -2147483648 + 2147483647 + -2147483648 + -2147483648 + 2147483647 + 2147483647 + -2147483648 + + + + true + + + + 1234.1234 + 12345678.12345678 + 1234567812345678.1234567812345678 + + + + string + normalized string + one two three + name + name-token + name tokens + ncname + en-us + + + xsi:schemaLocation + + + + elements1 + elements2 + elements1 + elements1 elements2 + + + + http://www.codesynthesis.com + + + + YmFzZTY0IGJpbmFyeQ== + 6865782052696E617279 + + + + 2001-10-26+02:00 + 2001-10-26T21:32:52+02:00 + P1Y2M3DT5H20M30S + ---01+02:00 + --11+02:00 + --11-02+02:00 + 2001+02:00 + 2001-11+02:00 + + + + diff --git a/tests/cxx/hybrid/binary/custom/test.xml b/tests/cxx/hybrid/binary/custom/test.xml deleted file mode 100644 index 1218c37..0000000 --- a/tests/cxx/hybrid/binary/custom/test.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - 1 2 3 - - abc - - left - - - aaa - - - aaa - bbb - c - cc - ccc - - - - 123 - abcdef - 12.34false - - - 65 - 66 - -222 - 57005 - -57005 - 3735928559 - -2147483648 - 2147483647 - -2147483648 - -2147483648 - 2147483647 - 2147483647 - -2147483648 - - - - true - - - - 1234.1234 - 12345678.12345678 - 1234567812345678.1234567812345678 - - - - string - normalized string - one two three - name - name-token - name tokens - ncname - en-us - - - xsi:schemaLocation - - - - elements1 - elements2 - elements1 - elements1 elements2 - - - - http://www.codesynthesis.com - - - - YmFzZTY0IGJpbmFyeQ== - 6865782052696E617279 - - - - 2001-10-26+02:00 - 2001-10-26T21:32:52+02:00 - P1Y2M3DT5H20M30S - ---01+02:00 - --11+02:00 - --11-02+02:00 - 2001+02:00 - 2001-11+02:00 - - - - diff --git a/tests/cxx/hybrid/binary/xdr/makefile b/tests/cxx/hybrid/binary/xdr/makefile index 678e147..348f3b9 100644 --- a/tests/cxx/hybrid/binary/xdr/makefile +++ b/tests/cxx/hybrid/binary/xdr/makefile @@ -55,8 +55,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output.xml - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output.xml -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/binary/xdr/output.xml b/tests/cxx/hybrid/binary/xdr/output.xml deleted file mode 100644 index f36f755..0000000 --- a/tests/cxx/hybrid/binary/xdr/output.xml +++ /dev/null @@ -1,2 +0,0 @@ -1 2 3abcleftaaaaaabbbcccccc123abcdef12.34false6566-22257005-570053735928559-21474836482147483647-2147483648-214748364821474836472147483647-2147483648true1234.1212345678.12345681234567812345678stringnormalized stringone two threenamename-tokenname tokensncnameen-usxsi:schemaLocationelements1elements2elements1elements1 elements2http://www.codesynthesis.comYmFzZTY0IGJpbmFyeQ== -6865782052696E6172792001-10-26+02:002001-10-26T21:32:52+02:00P1Y2M3DT5H20M30S---01+02:00--11+02:00--02-11+02:002001+02:002001-11+02:00 \ No newline at end of file diff --git a/tests/cxx/hybrid/binary/xdr/test-000.std b/tests/cxx/hybrid/binary/xdr/test-000.std new file mode 100644 index 0000000..f36f755 --- /dev/null +++ b/tests/cxx/hybrid/binary/xdr/test-000.std @@ -0,0 +1,2 @@ +1 2 3abcleftaaaaaabbbcccccc123abcdef12.34false6566-22257005-570053735928559-21474836482147483647-2147483648-214748364821474836472147483647-2147483648true1234.1212345678.12345681234567812345678stringnormalized stringone two threenamename-tokenname tokensncnameen-usxsi:schemaLocationelements1elements2elements1elements1 elements2http://www.codesynthesis.comYmFzZTY0IGJpbmFyeQ== +6865782052696E6172792001-10-26+02:002001-10-26T21:32:52+02:00P1Y2M3DT5H20M30S---01+02:00--11+02:00--02-11+02:002001+02:002001-11+02:00 \ No newline at end of file diff --git a/tests/cxx/hybrid/binary/xdr/test-000.xml b/tests/cxx/hybrid/binary/xdr/test-000.xml new file mode 100644 index 0000000..1218c37 --- /dev/null +++ b/tests/cxx/hybrid/binary/xdr/test-000.xml @@ -0,0 +1,93 @@ + + + 1 2 3 + + abc + + left + + + aaa + + + aaa + bbb + c + cc + ccc + + + + 123 + abcdef + 12.34false + + + 65 + 66 + -222 + 57005 + -57005 + 3735928559 + -2147483648 + 2147483647 + -2147483648 + -2147483648 + 2147483647 + 2147483647 + -2147483648 + + + + true + + + + 1234.1234 + 12345678.12345678 + 1234567812345678.1234567812345678 + + + + string + normalized string + one two three + name + name-token + name tokens + ncname + en-us + + + xsi:schemaLocation + + + + elements1 + elements2 + elements1 + elements1 elements2 + + + + http://www.codesynthesis.com + + + + YmFzZTY0IGJpbmFyeQ== + 6865782052696E617279 + + + + 2001-10-26+02:00 + 2001-10-26T21:32:52+02:00 + P1Y2M3DT5H20M30S + ---01+02:00 + --11+02:00 + --11-02+02:00 + 2001+02:00 + 2001-11+02:00 + + + + diff --git a/tests/cxx/hybrid/binary/xdr/test.xml b/tests/cxx/hybrid/binary/xdr/test.xml deleted file mode 100644 index 1218c37..0000000 --- a/tests/cxx/hybrid/binary/xdr/test.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - 1 2 3 - - abc - - left - - - aaa - - - aaa - bbb - c - cc - ccc - - - - 123 - abcdef - 12.34false - - - 65 - 66 - -222 - 57005 - -57005 - 3735928559 - -2147483648 - 2147483647 - -2147483648 - -2147483648 - 2147483647 - 2147483647 - -2147483648 - - - - true - - - - 1234.1234 - 12345678.12345678 - 1234567812345678.1234567812345678 - - - - string - normalized string - one two three - name - name-token - name tokens - ncname - en-us - - - xsi:schemaLocation - - - - elements1 - elements2 - elements1 - elements1 elements2 - - - - http://www.codesynthesis.com - - - - YmFzZTY0IGJpbmFyeQ== - 6865782052696E617279 - - - - 2001-10-26+02:00 - 2001-10-26T21:32:52+02:00 - P1Y2M3DT5H20M30S - ---01+02:00 - --11+02:00 - --11-02+02:00 - 2001+02:00 - 2001-11+02:00 - - - - diff --git a/tests/cxx/hybrid/built-in/makefile b/tests/cxx/hybrid/built-in/makefile index 56a1ac3..d9531d5 100644 --- a/tests/cxx/hybrid/built-in/makefile +++ b/tests/cxx/hybrid/built-in/makefile @@ -55,8 +55,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/built-in/output b/tests/cxx/hybrid/built-in/output deleted file mode 100644 index 6798590..0000000 --- a/tests/cxx/hybrid/built-in/output +++ /dev/null @@ -1,5 +0,0 @@ -123abc123456789123YmFzZTY0IGJpbmFyeQ== -YmFzZTY0IGJpbmFyeQ== -YmFzZTY0IGJpbmFyeQ== -YmFzZTY0IGJpbmFyeQ== -abcdefghijkl \ No newline at end of file diff --git a/tests/cxx/hybrid/built-in/test-000.std b/tests/cxx/hybrid/built-in/test-000.std new file mode 100644 index 0000000..6798590 --- /dev/null +++ b/tests/cxx/hybrid/built-in/test-000.std @@ -0,0 +1,5 @@ +123abc123456789123YmFzZTY0IGJpbmFyeQ== +YmFzZTY0IGJpbmFyeQ== +YmFzZTY0IGJpbmFyeQ== +YmFzZTY0IGJpbmFyeQ== +abcdefghijkl \ No newline at end of file diff --git a/tests/cxx/hybrid/built-in/test-000.xml b/tests/cxx/hybrid/built-in/test-000.xml new file mode 100644 index 0000000..ae72e80 --- /dev/null +++ b/tests/cxx/hybrid/built-in/test-000.xml @@ -0,0 +1,24 @@ + + + + 123abc + + + + + 123 + 456 + 789 + 123 + + YmFzZTY0IGJpbmFyeQ== + YmFzZTY0IGJpbmFyeQ== + YmFzZTY0IGJpbmFyeQ== + YmFzZTY0IGJpbmFyeQ== + + abc + def + ghi + jkl + + diff --git a/tests/cxx/hybrid/built-in/test.xml b/tests/cxx/hybrid/built-in/test.xml deleted file mode 100644 index ae72e80..0000000 --- a/tests/cxx/hybrid/built-in/test.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - 123abc - - - - - 123 - 456 - 789 - 123 - - YmFzZTY0IGJpbmFyeQ== - YmFzZTY0IGJpbmFyeQ== - YmFzZTY0IGJpbmFyeQ== - YmFzZTY0IGJpbmFyeQ== - - abc - def - ghi - jkl - - diff --git a/tests/cxx/hybrid/choice/makefile b/tests/cxx/hybrid/choice/makefile index 4c6d669..91c893a 100644 --- a/tests/cxx/hybrid/choice/makefile +++ b/tests/cxx/hybrid/choice/makefile @@ -55,8 +55,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/choice/output b/tests/cxx/hybrid/choice/output deleted file mode 100644 index b299e90..0000000 --- a/tests/cxx/hybrid/choice/output +++ /dev/null @@ -1 +0,0 @@ -123abcdef1.23123truefalseabc1.231231.231231.231234.564561.23true1.23true123truefalseabc1.23true1231.23truefalseabctrue1.23true1.23true123truefalseabc1.23true1231.23truefalseabctruetruetrue \ No newline at end of file diff --git a/tests/cxx/hybrid/choice/test-000.std b/tests/cxx/hybrid/choice/test-000.std new file mode 100644 index 0000000..b299e90 --- /dev/null +++ b/tests/cxx/hybrid/choice/test-000.std @@ -0,0 +1 @@ +123abcdef1.23123truefalseabc1.231231.231231.231234.564561.23true1.23true123truefalseabc1.23true1231.23truefalseabctrue1.23true1.23true123truefalseabc1.23true1231.23truefalseabctruetruetrue \ No newline at end of file diff --git a/tests/cxx/hybrid/choice/test-000.xml b/tests/cxx/hybrid/choice/test-000.xml new file mode 100644 index 0000000..48f06fd --- /dev/null +++ b/tests/cxx/hybrid/choice/test-000.xml @@ -0,0 +1,57 @@ + + + + + 123 + + abcdef + + 1.23123 + + truefalseabc + + + + 1.23123 + 1.23123 + 1.231234.56456 + + + + + 1.23 + true + 1.23 + true + + + 123 + truefalseabc + 1.23 + true + 1231.23 + truefalseabctrue + + + + + 1.23 + true + 1.23 + true + 123 + truefalseabc + 1.23 + true + 1231.23 + truefalseabctrue + + + + + true + true + + + diff --git a/tests/cxx/hybrid/choice/test.xml b/tests/cxx/hybrid/choice/test.xml deleted file mode 100644 index 48f06fd..0000000 --- a/tests/cxx/hybrid/choice/test.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - 123 - - abcdef - - 1.23123 - - truefalseabc - - - - 1.23123 - 1.23123 - 1.231234.56456 - - - - - 1.23 - true - 1.23 - true - - - 123 - truefalseabc - 1.23 - true - 1231.23 - truefalseabctrue - - - - - 1.23 - true - 1.23 - true - 123 - truefalseabc - 1.23 - true - 1231.23 - truefalseabctrue - - - - - true - true - - - diff --git a/tests/cxx/hybrid/default/makefile b/tests/cxx/hybrid/default/makefile index 5e0e55e..5dd5d04 100644 --- a/tests/cxx/hybrid/default/makefile +++ b/tests/cxx/hybrid/default/makefile @@ -55,8 +55,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/default/output b/tests/cxx/hybrid/default/output deleted file mode 100644 index 8d41894..0000000 --- a/tests/cxx/hybrid/default/output +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/tests/cxx/hybrid/default/test-000.std b/tests/cxx/hybrid/default/test-000.std new file mode 100644 index 0000000..8d41894 --- /dev/null +++ b/tests/cxx/hybrid/default/test-000.std @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tests/cxx/hybrid/default/test-000.xml b/tests/cxx/hybrid/default/test-000.xml new file mode 100644 index 0000000..11bd0a7 --- /dev/null +++ b/tests/cxx/hybrid/default/test-000.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/tests/cxx/hybrid/default/test.xml b/tests/cxx/hybrid/default/test.xml deleted file mode 100644 index 11bd0a7..0000000 --- a/tests/cxx/hybrid/default/test.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/tests/cxx/hybrid/list/makefile b/tests/cxx/hybrid/list/makefile index ef24411..a4f4de0 100644 --- a/tests/cxx/hybrid/list/makefile +++ b/tests/cxx/hybrid/list/makefile @@ -55,8 +55,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/list/output b/tests/cxx/hybrid/list/output deleted file mode 100644 index 6c1ac43..0000000 --- a/tests/cxx/hybrid/list/output +++ /dev/null @@ -1 +0,0 @@ -123 456 789one t:two threeabc def ghiabc def ghi \ No newline at end of file diff --git a/tests/cxx/hybrid/list/test-000.std b/tests/cxx/hybrid/list/test-000.std new file mode 100644 index 0000000..6c1ac43 --- /dev/null +++ b/tests/cxx/hybrid/list/test-000.std @@ -0,0 +1 @@ +123 456 789one t:two threeabc def ghiabc def ghi \ No newline at end of file diff --git a/tests/cxx/hybrid/list/test-000.xml b/tests/cxx/hybrid/list/test-000.xml new file mode 100644 index 0000000..2451a4b --- /dev/null +++ b/tests/cxx/hybrid/list/test-000.xml @@ -0,0 +1,8 @@ + + + 123 456 789 + one t:two three + abc def ghi + abc def ghi + + diff --git a/tests/cxx/hybrid/list/test.xml b/tests/cxx/hybrid/list/test.xml deleted file mode 100644 index 2451a4b..0000000 --- a/tests/cxx/hybrid/list/test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - 123 456 789 - one t:two three - abc def ghi - abc def ghi - - diff --git a/tests/cxx/hybrid/polymorphism/any-type/makefile b/tests/cxx/hybrid/polymorphism/any-type/makefile index 7f44bfb..3f59fc5 100644 --- a/tests/cxx/hybrid/polymorphism/any-type/makefile +++ b/tests/cxx/hybrid/polymorphism/any-type/makefile @@ -56,8 +56,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/polymorphism/any-type/test-000.xml b/tests/cxx/hybrid/polymorphism/any-type/test-000.xml new file mode 100644 index 0000000..f0a8bcb --- /dev/null +++ b/tests/cxx/hybrid/polymorphism/any-type/test-000.xml @@ -0,0 +1,7 @@ + + + abcjunk123 + 123abc + 123abc987 + + diff --git a/tests/cxx/hybrid/polymorphism/any-type/test.xml b/tests/cxx/hybrid/polymorphism/any-type/test.xml deleted file mode 100644 index f0a8bcb..0000000 --- a/tests/cxx/hybrid/polymorphism/any-type/test.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - abcjunk123 - 123abc - 123abc987 - - diff --git a/tests/cxx/hybrid/polymorphism/multischema/makefile b/tests/cxx/hybrid/polymorphism/multischema/makefile index 7670908..96ce17f 100644 --- a/tests/cxx/hybrid/polymorphism/multischema/makefile +++ b/tests/cxx/hybrid/polymorphism/multischema/makefile @@ -57,8 +57,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/polymorphism/multischema/output b/tests/cxx/hybrid/polymorphism/multischema/output deleted file mode 100644 index 341775b..0000000 --- a/tests/cxx/hybrid/polymorphism/multischema/output +++ /dev/null @@ -1 +0,0 @@ -abc123abctrueabc123true \ No newline at end of file diff --git a/tests/cxx/hybrid/polymorphism/multischema/test-000.std b/tests/cxx/hybrid/polymorphism/multischema/test-000.std new file mode 100644 index 0000000..341775b --- /dev/null +++ b/tests/cxx/hybrid/polymorphism/multischema/test-000.std @@ -0,0 +1 @@ +abc123abctrueabc123true \ No newline at end of file diff --git a/tests/cxx/hybrid/polymorphism/multischema/test-000.xml b/tests/cxx/hybrid/polymorphism/multischema/test-000.xml new file mode 100644 index 0000000..d6e3e43 --- /dev/null +++ b/tests/cxx/hybrid/polymorphism/multischema/test-000.xml @@ -0,0 +1,7 @@ + + + abc123 + abctrue + abc123true + + diff --git a/tests/cxx/hybrid/polymorphism/multischema/test.xml b/tests/cxx/hybrid/polymorphism/multischema/test.xml deleted file mode 100644 index d6e3e43..0000000 --- a/tests/cxx/hybrid/polymorphism/multischema/test.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - abc123 - abctrue - abc123true - - diff --git a/tests/cxx/hybrid/recursive/makefile b/tests/cxx/hybrid/recursive/makefile index 240299b..b7975b6 100644 --- a/tests/cxx/hybrid/recursive/makefile +++ b/tests/cxx/hybrid/recursive/makefile @@ -55,8 +55,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/recursive/output b/tests/cxx/hybrid/recursive/output deleted file mode 100644 index 6b89789..0000000 --- a/tests/cxx/hybrid/recursive/output +++ /dev/null @@ -1 +0,0 @@ -123123123123123123123123123abca1123abca1456defb2123abca1456defb2789ghic3123abc123abc123abc123abc123abcdef123abcdefghi \ No newline at end of file diff --git a/tests/cxx/hybrid/recursive/test-000.std b/tests/cxx/hybrid/recursive/test-000.std new file mode 100644 index 0000000..6b89789 --- /dev/null +++ b/tests/cxx/hybrid/recursive/test-000.std @@ -0,0 +1 @@ +123123123123123123123123123abca1123abca1456defb2123abca1456defb2789ghic3123abc123abc123abc123abc123abcdef123abcdefghi \ No newline at end of file diff --git a/tests/cxx/hybrid/recursive/test-000.xml b/tests/cxx/hybrid/recursive/test-000.xml new file mode 100644 index 0000000..4db2950 --- /dev/null +++ b/tests/cxx/hybrid/recursive/test-000.xml @@ -0,0 +1,25 @@ + + + 123 + 123 + 123 + + + 123 + 123 + 123 + 123123 + + 123abca1 + 123abca1456defb2 + 123abca1456defb2789ghic3 + + 123abc + 123abc + 123abc + + 123abc + 123abcdef + 123abcdefghi + + diff --git a/tests/cxx/hybrid/recursive/test.xml b/tests/cxx/hybrid/recursive/test.xml deleted file mode 100644 index 4db2950..0000000 --- a/tests/cxx/hybrid/recursive/test.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 123 - 123 - 123 - - - 123 - 123 - 123 - 123123 - - 123abca1 - 123abca1456defb2 - 123abca1456defb2789ghic3 - - 123abc - 123abc - 123abc - - 123abc - 123abcdef - 123abcdefghi - - diff --git a/tests/cxx/hybrid/test-template/makefile b/tests/cxx/hybrid/test-template/makefile index 28c2b1a..f4a22ed 100644 --- a/tests/cxx/hybrid/test-template/makefile +++ b/tests/cxx/hybrid/test-template/makefile @@ -55,8 +55,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/test-template/output b/tests/cxx/hybrid/test-template/output deleted file mode 100644 index 66261f6..0000000 --- a/tests/cxx/hybrid/test-template/output +++ /dev/null @@ -1 +0,0 @@ -123 \ No newline at end of file diff --git a/tests/cxx/hybrid/test-template/test-000.std b/tests/cxx/hybrid/test-template/test-000.std new file mode 100644 index 0000000..66261f6 --- /dev/null +++ b/tests/cxx/hybrid/test-template/test-000.std @@ -0,0 +1 @@ +123 \ No newline at end of file diff --git a/tests/cxx/hybrid/test-template/test-000.xml b/tests/cxx/hybrid/test-template/test-000.xml new file mode 100644 index 0000000..1b7571e --- /dev/null +++ b/tests/cxx/hybrid/test-template/test-000.xml @@ -0,0 +1,5 @@ + + + 123 + + diff --git a/tests/cxx/hybrid/test-template/test.xml b/tests/cxx/hybrid/test-template/test.xml deleted file mode 100644 index 1b7571e..0000000 --- a/tests/cxx/hybrid/test-template/test.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 123 - - diff --git a/tests/cxx/hybrid/union/makefile b/tests/cxx/hybrid/union/makefile index 9038c4f..e3ff63e 100644 --- a/tests/cxx/hybrid/union/makefile +++ b/tests/cxx/hybrid/union/makefile @@ -55,8 +55,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -ubB $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/hybrid/union/output b/tests/cxx/hybrid/union/output deleted file mode 100644 index 9748083..0000000 --- a/tests/cxx/hybrid/union/output +++ /dev/null @@ -1 +0,0 @@ -123one \ No newline at end of file diff --git a/tests/cxx/hybrid/union/test-000.std b/tests/cxx/hybrid/union/test-000.std new file mode 100644 index 0000000..9748083 --- /dev/null +++ b/tests/cxx/hybrid/union/test-000.std @@ -0,0 +1 @@ +123one \ No newline at end of file diff --git a/tests/cxx/hybrid/union/test-000.xml b/tests/cxx/hybrid/union/test-000.xml new file mode 100644 index 0000000..a2218b2 --- /dev/null +++ b/tests/cxx/hybrid/union/test-000.xml @@ -0,0 +1,6 @@ + + + 123 + one + + diff --git a/tests/cxx/hybrid/union/test.xml b/tests/cxx/hybrid/union/test.xml deleted file mode 100644 index a2218b2..0000000 --- a/tests/cxx/hybrid/union/test.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 123 - one - - diff --git a/tests/cxx/parser/built-in/makefile b/tests/cxx/parser/built-in/makefile index 8446efe..7a30cdb 100644 --- a/tests/cxx/parser/built-in/makefile +++ b/tests/cxx/parser/built-in/makefile @@ -43,11 +43,11 @@ $(out_base)/: $(driver) $(test): driver := $(driver) ifeq ($(xsde_longlong),y) -$(test): $(driver) $(src_base)/test-long-long.xml $(src_base)/output-long-long - $(call message,test $$1,$$1 $(src_base)/test-long-long.xml | diff -u $(src_base)/output-long-long -,$(driver)) +$(test): $(driver) $(src_base)/test-long-long-000.xml $(src_base)/test-long-long-000.std + $(call message,test $$1,$$1 $(src_base)/test-long-long-000.xml | diff -u $(src_base)/test-long-long-000.std -,$(driver)) else -$(test): $(driver) $(src_base)/test-long.xml $(src_base)/output-long - $(call message,test $$1,$$1 $(src_base)/test-long.xml | diff -u $(src_base)/output-long -,$(driver)) +$(test): $(driver) $(src_base)/test-long-000.xml $(src_base)/test-long-000.std + $(call message,test $$1,$$1 $(src_base)/test-long-000.xml | diff -u $(src_base)/test-long-000.std -,$(driver)) endif # Clean. diff --git a/tests/cxx/parser/built-in/output-long b/tests/cxx/parser/built-in/output-long deleted file mode 100644 index f3526bc..0000000 --- a/tests/cxx/parser/built-in/output-long +++ /dev/null @@ -1,167 +0,0 @@ -{ - any attribute x = 'x' - any text: ' -' - any text: ' ' - start any element 'a' - any text: 'a' - end any element 'a' - any text: ' -' - any text: ' ' - start any element 'any-type' - any attribute x = 'xxx' - any text: 'aaa' - start any element 'a' - any text: 'bbb' - end any element 'a' - any text: 'ccc' - end any element 'any-type' - any text: ' -' - any text: ' ' -} - -{ - any text: '123abc' -} - -1 -0 -1 -0 -0 -127 --128 -123 -0 -255 -123 -0 -32767 --32768 --12345 -0 -65535 -12345 -0 -2147483647 --2147483648 --1234567890 -0 -4294967295 -1234567890 -0 -2147483647 --2147483648 --1234567890 -0 -4294967295 -1234567890 -0 -2147483647 --2147483648 --1234567890 --2147483648 --1234567890 -0 --2147483648 --1234567890 -4294967295 -1234567890 -0 -4294967295 -1234567890 -0 -0 --0 -inf --inf -nan -123.567 -123.567 --1.23567e+07 --4.5e-06 -0 -0 --0 -inf --inf -nan -123.567 -123.567 --1.23567e+07 --4.5e-06 -0 -0 --0 -123.567 -123.567 --123.567 -'string space -newline - ' -' string space newline ' -'string space newline' -'as123:345-.abs' -'1as123:345-.abs' -'abc 123 ' -'as123_345-.abs' -'as123_345-.abs' -'abc' -'a123' -'as123_345-.abs' -'abc a123 ' -'x' -'en' -'en-us' -'one-two-three-four44-seven77-eight888' -'' -'relative' -'#id' -'http://www.example.com/foo#bar' -':schemaLocation' -'xsi:schemaLocation' -'12345abcjk' -'a' -'ab' -'abc' -'' -'12345abcjk' -12+12:0 -1 -31 -15+0:0 -15-14:0 -10+12:0 -1 -12+0:0 -2007+12:0 -1 --20000+0:0 -10-28+12:0 -12-31 -1-1+0:0 -2007-12+12:0 --2007-10 -20007-10+0:0 --20007-1 -2007-12-26+12:0 --2007-10-15 -20007-12-31+0:0 --20007-1-1 -12:46:23.456+12:0 -12:13:14 -12:13:14+0:0 -2007-12-26T12:13:14.123+12:0 --2007-10-15T12:13:14 -20007-12-31T12:13:14+0:0 --20007-1-1T12:13:14 --P2007Y13M32DT25H61M61.123S -P1Y0M0DT0H0M0S -P0Y1M0DT0H0M0S -P0Y0M1DT0H0M0S -P0Y0M0DT1H0M0S -P0Y0M0DT0H1M0S -P0Y0M0DT0H0M1.1S -P1Y0M0DT0H0M1S diff --git a/tests/cxx/parser/built-in/output-long-long b/tests/cxx/parser/built-in/output-long-long deleted file mode 100644 index 3b80787..0000000 --- a/tests/cxx/parser/built-in/output-long-long +++ /dev/null @@ -1,167 +0,0 @@ -{ - any attribute x = 'x' - any text: ' -' - any text: ' ' - start any element 'a' - any text: 'a' - end any element 'a' - any text: ' -' - any text: ' ' - start any element 'any-type' - any attribute x = 'xxx' - any text: 'aaa' - start any element 'a' - any text: 'bbb' - end any element 'a' - any text: 'ccc' - end any element 'any-type' - any text: ' -' - any text: ' ' -} - -{ - any text: '123abc' -} - -1 -0 -1 -0 -0 -127 --128 -123 -0 -255 -123 -0 -32767 --32768 --12345 -0 -65535 -12345 -0 -2147483647 --2147483648 --1234567890 -0 -4294967295 -1234567890 -0 -9223372036854775807 --9223372036854775808 --1234567890123456789 -0 -18446744073709551615 -12345678901234567890 -0 -2147483647 --2147483648 --1234567890 --2147483648 --1234567890 -0 --2147483648 --1234567890 -4294967295 -1234567890 -0 -4294967295 -1234567890 -0 -0 --0 -inf --inf -nan -123.567 -123.567 --1.23567e+07 --4.5e-06 -0 -0 --0 -inf --inf -nan -123.567 -123.567 --1.23567e+07 --4.5e-06 -0 -0 --0 -123.567 -123.567 --123.567 -'string space -newline - ' -' string space newline ' -'string space newline' -'as123:345-.abs' -'1as123:345-.abs' -'abc 123 ' -'as123_345-.abs' -'as123_345-.abs' -'abc' -'a123' -'as123_345-.abs' -'abc a123 ' -'x' -'en' -'en-us' -'one-two-three-four44-seven77-eight888' -'' -'relative' -'#id' -'http://www.example.com/foo#bar' -':schemaLocation' -'xsi:schemaLocation' -'12345abcjk' -'a' -'ab' -'abc' -'' -'12345abcjk' -12+12:0 -1 -31 -15+0:0 -15-14:0 -10+12:0 -1 -12+0:0 -2007+12:0 -1 --20000+0:0 -10-28+12:0 -12-31 -1-1+0:0 -2007-12+12:0 --2007-10 -20007-10+0:0 --20007-1 -2007-12-26+12:0 --2007-10-15 -20007-12-31+0:0 --20007-1-1 -12:46:23.456+12:0 -12:13:14 -12:13:14+0:0 -2007-12-26T12:13:14.123+12:0 --2007-10-15T12:13:14 -20007-12-31T12:13:14+0:0 --20007-1-1T12:13:14 --P2007Y13M32DT25H61M61.123S -P1Y0M0DT0H0M0S -P0Y1M0DT0H0M0S -P0Y0M1DT0H0M0S -P0Y0M0DT1H0M0S -P0Y0M0DT0H1M0S -P0Y0M0DT0H0M1.1S -P1Y0M0DT0H0M1S diff --git a/tests/cxx/parser/built-in/test-long-000.std b/tests/cxx/parser/built-in/test-long-000.std new file mode 100644 index 0000000..f3526bc --- /dev/null +++ b/tests/cxx/parser/built-in/test-long-000.std @@ -0,0 +1,167 @@ +{ + any attribute x = 'x' + any text: ' +' + any text: ' ' + start any element 'a' + any text: 'a' + end any element 'a' + any text: ' +' + any text: ' ' + start any element 'any-type' + any attribute x = 'xxx' + any text: 'aaa' + start any element 'a' + any text: 'bbb' + end any element 'a' + any text: 'ccc' + end any element 'any-type' + any text: ' +' + any text: ' ' +} + +{ + any text: '123abc' +} + +1 +0 +1 +0 +0 +127 +-128 +123 +0 +255 +123 +0 +32767 +-32768 +-12345 +0 +65535 +12345 +0 +2147483647 +-2147483648 +-1234567890 +0 +4294967295 +1234567890 +0 +2147483647 +-2147483648 +-1234567890 +0 +4294967295 +1234567890 +0 +2147483647 +-2147483648 +-1234567890 +-2147483648 +-1234567890 +0 +-2147483648 +-1234567890 +4294967295 +1234567890 +0 +4294967295 +1234567890 +0 +0 +-0 +inf +-inf +nan +123.567 +123.567 +-1.23567e+07 +-4.5e-06 +0 +0 +-0 +inf +-inf +nan +123.567 +123.567 +-1.23567e+07 +-4.5e-06 +0 +0 +-0 +123.567 +123.567 +-123.567 +'string space +newline + ' +' string space newline ' +'string space newline' +'as123:345-.abs' +'1as123:345-.abs' +'abc 123 ' +'as123_345-.abs' +'as123_345-.abs' +'abc' +'a123' +'as123_345-.abs' +'abc a123 ' +'x' +'en' +'en-us' +'one-two-three-four44-seven77-eight888' +'' +'relative' +'#id' +'http://www.example.com/foo#bar' +':schemaLocation' +'xsi:schemaLocation' +'12345abcjk' +'a' +'ab' +'abc' +'' +'12345abcjk' +12+12:0 +1 +31 +15+0:0 +15-14:0 +10+12:0 +1 +12+0:0 +2007+12:0 +1 +-20000+0:0 +10-28+12:0 +12-31 +1-1+0:0 +2007-12+12:0 +-2007-10 +20007-10+0:0 +-20007-1 +2007-12-26+12:0 +-2007-10-15 +20007-12-31+0:0 +-20007-1-1 +12:46:23.456+12:0 +12:13:14 +12:13:14+0:0 +2007-12-26T12:13:14.123+12:0 +-2007-10-15T12:13:14 +20007-12-31T12:13:14+0:0 +-20007-1-1T12:13:14 +-P2007Y13M32DT25H61M61.123S +P1Y0M0DT0H0M0S +P0Y1M0DT0H0M0S +P0Y0M1DT0H0M0S +P0Y0M0DT1H0M0S +P0Y0M0DT0H1M0S +P0Y0M0DT0H0M1.1S +P1Y0M0DT0H0M1S diff --git a/tests/cxx/parser/built-in/test-long-000.xml b/tests/cxx/parser/built-in/test-long-000.xml new file mode 100644 index 0000000..380b0f4 --- /dev/null +++ b/tests/cxx/parser/built-in/test-long-000.xml @@ -0,0 +1,199 @@ + + + + a + aaabbbccc + + + 123abc + + 1 + 0 + true + false + + 0 + +127 + -128 + 123 + + 0 + 255 + 123 + + 0 + +32767 + -32768 + -12345 + + 0 + 65535 + 12345 + + 0 + +2147483647 + -2147483648 + -1234567890 + + 0 + 4294967295 + 1234567890 + + 0 + +2147483647 + -2147483648 + -1234567890 + + 0 + 4294967295 + 1234567890 + + 0 + +2147483647 + -02147483648 + -1234567890 + + -02147483648 + -1234567890 + + 0 + -02147483648 + -1234567890 + + 4294967295 + +01234567890 + + 0 + 4294967295 + +01234567890 + + 0 + +0 + -0 + INF + -INF + NaN + 123.567 + +123.567 + -123.567e5 + -.45E-5 + + 0 + +0 + -0 + INF + -INF + NaN + 123.567 + +123.567 + -123.567e5 + -.45E-5 + + 0 + +0 + -0 + 123.567 + +123.567 + -123.567 + + string space +newline + + + string space +newline + + + + string space +newline + + + + as123:345-.abs + + 1as123:345-.abs + + abc 123 + + as123_345-.abs + + as123_345-.abs + abc + a123 + + as123_345-.abs + + abc a123 + + x + en + en-us + one-two-three-four44-seven77-eight888 + + + relative + #id + http://www.example.com/foo#bar + + schemaLocation + xsi:schemaLocation + + MTIzND + VhYmNqaw = = + YQ== + YWI= + YWJj + + + 31323334356162636a6b + + ---12+12:00 + ---01 + ---31 + ---15Z + ---15-14:00 + + --10+12:00 + --01 + --12Z + + 2007+12:00 + 0001 + -20000Z + + --10-28+12:00 + --12-31 + --01-01Z + + 2007-12+12:00 + -2007-10 + 20007-10Z + -20007-01 + + 2007-12-26+12:00 + -2007-10-15 + 20007-12-31Z + -20007-01-01 + + + + + + 2007-12-26T12:13:14.123+12:00 + -2007-10-15T12:13:14 + 20007-12-31T12:13:14Z + -20007-01-01T12:13:14 + + -P2007Y13M32DT25H61M61.123S + P1Y + P1M + P1D + PT1H + PT1M + PT1.1S + P1YT1S + + diff --git a/tests/cxx/parser/built-in/test-long-long-000.std b/tests/cxx/parser/built-in/test-long-long-000.std new file mode 100644 index 0000000..3b80787 --- /dev/null +++ b/tests/cxx/parser/built-in/test-long-long-000.std @@ -0,0 +1,167 @@ +{ + any attribute x = 'x' + any text: ' +' + any text: ' ' + start any element 'a' + any text: 'a' + end any element 'a' + any text: ' +' + any text: ' ' + start any element 'any-type' + any attribute x = 'xxx' + any text: 'aaa' + start any element 'a' + any text: 'bbb' + end any element 'a' + any text: 'ccc' + end any element 'any-type' + any text: ' +' + any text: ' ' +} + +{ + any text: '123abc' +} + +1 +0 +1 +0 +0 +127 +-128 +123 +0 +255 +123 +0 +32767 +-32768 +-12345 +0 +65535 +12345 +0 +2147483647 +-2147483648 +-1234567890 +0 +4294967295 +1234567890 +0 +9223372036854775807 +-9223372036854775808 +-1234567890123456789 +0 +18446744073709551615 +12345678901234567890 +0 +2147483647 +-2147483648 +-1234567890 +-2147483648 +-1234567890 +0 +-2147483648 +-1234567890 +4294967295 +1234567890 +0 +4294967295 +1234567890 +0 +0 +-0 +inf +-inf +nan +123.567 +123.567 +-1.23567e+07 +-4.5e-06 +0 +0 +-0 +inf +-inf +nan +123.567 +123.567 +-1.23567e+07 +-4.5e-06 +0 +0 +-0 +123.567 +123.567 +-123.567 +'string space +newline + ' +' string space newline ' +'string space newline' +'as123:345-.abs' +'1as123:345-.abs' +'abc 123 ' +'as123_345-.abs' +'as123_345-.abs' +'abc' +'a123' +'as123_345-.abs' +'abc a123 ' +'x' +'en' +'en-us' +'one-two-three-four44-seven77-eight888' +'' +'relative' +'#id' +'http://www.example.com/foo#bar' +':schemaLocation' +'xsi:schemaLocation' +'12345abcjk' +'a' +'ab' +'abc' +'' +'12345abcjk' +12+12:0 +1 +31 +15+0:0 +15-14:0 +10+12:0 +1 +12+0:0 +2007+12:0 +1 +-20000+0:0 +10-28+12:0 +12-31 +1-1+0:0 +2007-12+12:0 +-2007-10 +20007-10+0:0 +-20007-1 +2007-12-26+12:0 +-2007-10-15 +20007-12-31+0:0 +-20007-1-1 +12:46:23.456+12:0 +12:13:14 +12:13:14+0:0 +2007-12-26T12:13:14.123+12:0 +-2007-10-15T12:13:14 +20007-12-31T12:13:14+0:0 +-20007-1-1T12:13:14 +-P2007Y13M32DT25H61M61.123S +P1Y0M0DT0H0M0S +P0Y1M0DT0H0M0S +P0Y0M1DT0H0M0S +P0Y0M0DT1H0M0S +P0Y0M0DT0H1M0S +P0Y0M0DT0H0M1.1S +P1Y0M0DT0H0M1S diff --git a/tests/cxx/parser/built-in/test-long-long-000.xml b/tests/cxx/parser/built-in/test-long-long-000.xml new file mode 100644 index 0000000..8d9332a --- /dev/null +++ b/tests/cxx/parser/built-in/test-long-long-000.xml @@ -0,0 +1,199 @@ + + + + a + aaabbbccc + + + 123abc + + 1 + 0 + true + false + + 0 + +127 + -128 + 123 + + 0 + 255 + 123 + + 0 + +32767 + -32768 + -12345 + + 0 + 65535 + 12345 + + 0 + +2147483647 + -2147483648 + -1234567890 + + 0 + 4294967295 + 1234567890 + + 0 + +9223372036854775807 + -9223372036854775808 + -1234567890123456789 + + 0 + 18446744073709551615 + 12345678901234567890 + + 0 + +2147483647 + -02147483648 + -1234567890 + + -02147483648 + -1234567890 + + 0 + -02147483648 + -1234567890 + + 4294967295 + +01234567890 + + 0 + 4294967295 + +01234567890 + + 0 + +0 + -0 + INF + -INF + NaN + 123.567 + +123.567 + -123.567e5 + -.45E-5 + + 0 + +0 + -0 + INF + -INF + NaN + 123.567 + +123.567 + -123.567e5 + -.45E-5 + + 0 + +0 + -0 + 123.567 + +123.567 + -123.567 + + string space +newline + + + string space +newline + + + + string space +newline + + + + as123:345-.abs + + 1as123:345-.abs + + abc 123 + + as123_345-.abs + + as123_345-.abs + abc + a123 + + as123_345-.abs + + abc a123 + + x + en + en-us + one-two-three-four44-seven77-eight888 + + + relative + #id + http://www.example.com/foo#bar + + schemaLocation + xsi:schemaLocation + + MTIzND + VhYmNqaw = = + YQ== + YWI= + YWJj + + + 31323334356162636a6b + + ---12+12:00 + ---01 + ---31 + ---15Z + ---15-14:00 + + --10+12:00 + --01 + --12Z + + 2007+12:00 + 0001 + -20000Z + + --10-28+12:00 + --12-31 + --01-01Z + + 2007-12+12:00 + -2007-10 + 20007-10Z + -20007-01 + + 2007-12-26+12:00 + -2007-10-15 + 20007-12-31Z + -20007-01-01 + + + + + + 2007-12-26T12:13:14.123+12:00 + -2007-10-15T12:13:14 + 20007-12-31T12:13:14Z + -20007-01-01T12:13:14 + + -P2007Y13M32DT25H61M61.123S + P1Y + P1M + P1D + PT1H + PT1M + PT1.1S + P1YT1S + + diff --git a/tests/cxx/parser/built-in/test-long-long.xml b/tests/cxx/parser/built-in/test-long-long.xml deleted file mode 100644 index 8d9332a..0000000 --- a/tests/cxx/parser/built-in/test-long-long.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - a - aaabbbccc - - - 123abc - - 1 - 0 - true - false - - 0 - +127 - -128 - 123 - - 0 - 255 - 123 - - 0 - +32767 - -32768 - -12345 - - 0 - 65535 - 12345 - - 0 - +2147483647 - -2147483648 - -1234567890 - - 0 - 4294967295 - 1234567890 - - 0 - +9223372036854775807 - -9223372036854775808 - -1234567890123456789 - - 0 - 18446744073709551615 - 12345678901234567890 - - 0 - +2147483647 - -02147483648 - -1234567890 - - -02147483648 - -1234567890 - - 0 - -02147483648 - -1234567890 - - 4294967295 - +01234567890 - - 0 - 4294967295 - +01234567890 - - 0 - +0 - -0 - INF - -INF - NaN - 123.567 - +123.567 - -123.567e5 - -.45E-5 - - 0 - +0 - -0 - INF - -INF - NaN - 123.567 - +123.567 - -123.567e5 - -.45E-5 - - 0 - +0 - -0 - 123.567 - +123.567 - -123.567 - - string space -newline - - - string space -newline - - - - string space -newline - - - - as123:345-.abs - - 1as123:345-.abs - - abc 123 - - as123_345-.abs - - as123_345-.abs - abc - a123 - - as123_345-.abs - - abc a123 - - x - en - en-us - one-two-three-four44-seven77-eight888 - - - relative - #id - http://www.example.com/foo#bar - - schemaLocation - xsi:schemaLocation - - MTIzND - VhYmNqaw = = - YQ== - YWI= - YWJj - - - 31323334356162636a6b - - ---12+12:00 - ---01 - ---31 - ---15Z - ---15-14:00 - - --10+12:00 - --01 - --12Z - - 2007+12:00 - 0001 - -20000Z - - --10-28+12:00 - --12-31 - --01-01Z - - 2007-12+12:00 - -2007-10 - 20007-10Z - -20007-01 - - 2007-12-26+12:00 - -2007-10-15 - 20007-12-31Z - -20007-01-01 - - - - - - 2007-12-26T12:13:14.123+12:00 - -2007-10-15T12:13:14 - 20007-12-31T12:13:14Z - -20007-01-01T12:13:14 - - -P2007Y13M32DT25H61M61.123S - P1Y - P1M - P1D - PT1H - PT1M - PT1.1S - P1YT1S - - diff --git a/tests/cxx/parser/built-in/test-long.xml b/tests/cxx/parser/built-in/test-long.xml deleted file mode 100644 index 380b0f4..0000000 --- a/tests/cxx/parser/built-in/test-long.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - a - aaabbbccc - - - 123abc - - 1 - 0 - true - false - - 0 - +127 - -128 - 123 - - 0 - 255 - 123 - - 0 - +32767 - -32768 - -12345 - - 0 - 65535 - 12345 - - 0 - +2147483647 - -2147483648 - -1234567890 - - 0 - 4294967295 - 1234567890 - - 0 - +2147483647 - -2147483648 - -1234567890 - - 0 - 4294967295 - 1234567890 - - 0 - +2147483647 - -02147483648 - -1234567890 - - -02147483648 - -1234567890 - - 0 - -02147483648 - -1234567890 - - 4294967295 - +01234567890 - - 0 - 4294967295 - +01234567890 - - 0 - +0 - -0 - INF - -INF - NaN - 123.567 - +123.567 - -123.567e5 - -.45E-5 - - 0 - +0 - -0 - INF - -INF - NaN - 123.567 - +123.567 - -123.567e5 - -.45E-5 - - 0 - +0 - -0 - 123.567 - +123.567 - -123.567 - - string space -newline - - - string space -newline - - - - string space -newline - - - - as123:345-.abs - - 1as123:345-.abs - - abc 123 - - as123_345-.abs - - as123_345-.abs - abc - a123 - - as123_345-.abs - - abc a123 - - x - en - en-us - one-two-three-four44-seven77-eight888 - - - relative - #id - http://www.example.com/foo#bar - - schemaLocation - xsi:schemaLocation - - MTIzND - VhYmNqaw = = - YQ== - YWI= - YWJj - - - 31323334356162636a6b - - ---12+12:00 - ---01 - ---31 - ---15Z - ---15-14:00 - - --10+12:00 - --01 - --12Z - - 2007+12:00 - 0001 - -20000Z - - --10-28+12:00 - --12-31 - --01-01Z - - 2007-12+12:00 - -2007-10 - 20007-10Z - -20007-01 - - 2007-12-26+12:00 - -2007-10-15 - 20007-12-31Z - -20007-01-01 - - - - - - 2007-12-26T12:13:14.123+12:00 - -2007-10-15T12:13:14 - 20007-12-31T12:13:14Z - -20007-01-01T12:13:14 - - -P2007Y13M32DT25H61M61.123S - P1Y - P1M - P1D - PT1H - PT1M - PT1.1S - P1YT1S - - diff --git a/tests/cxx/parser/duplicate/makefile b/tests/cxx/parser/duplicate/makefile index 85a7f5b..8c7b717 100644 --- a/tests/cxx/parser/duplicate/makefile +++ b/tests/cxx/parser/duplicate/makefile @@ -44,8 +44,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/duplicate/output b/tests/cxx/parser/duplicate/output deleted file mode 100644 index f03814e..0000000 --- a/tests/cxx/parser/duplicate/output +++ /dev/null @@ -1,3 +0,0 @@ -a: 1 -a: 2 -a: 3 diff --git a/tests/cxx/parser/duplicate/test-000.std b/tests/cxx/parser/duplicate/test-000.std new file mode 100644 index 0000000..f03814e --- /dev/null +++ b/tests/cxx/parser/duplicate/test-000.std @@ -0,0 +1,3 @@ +a: 1 +a: 2 +a: 3 diff --git a/tests/cxx/parser/duplicate/test-000.xml b/tests/cxx/parser/duplicate/test-000.xml new file mode 100644 index 0000000..62e4c0b --- /dev/null +++ b/tests/cxx/parser/duplicate/test-000.xml @@ -0,0 +1,9 @@ + + + 1 + 2 + 3 + + diff --git a/tests/cxx/parser/duplicate/test.xml b/tests/cxx/parser/duplicate/test.xml deleted file mode 100644 index 62e4c0b..0000000 --- a/tests/cxx/parser/duplicate/test.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - 1 - 2 - 3 - - diff --git a/tests/cxx/parser/enumeration/makefile b/tests/cxx/parser/enumeration/makefile index 56d3e92..0997aab 100644 --- a/tests/cxx/parser/enumeration/makefile +++ b/tests/cxx/parser/enumeration/makefile @@ -45,8 +45,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/enumeration/output b/tests/cxx/parser/enumeration/output deleted file mode 100644 index 16db301..0000000 --- a/tests/cxx/parser/enumeration/output +++ /dev/null @@ -1,3 +0,0 @@ -1 -0 -1 diff --git a/tests/cxx/parser/enumeration/test-000.std b/tests/cxx/parser/enumeration/test-000.std new file mode 100644 index 0000000..16db301 --- /dev/null +++ b/tests/cxx/parser/enumeration/test-000.std @@ -0,0 +1,3 @@ +1 +0 +1 diff --git a/tests/cxx/parser/enumeration/test-000.xml b/tests/cxx/parser/enumeration/test-000.xml new file mode 100644 index 0000000..a6fa893 --- /dev/null +++ b/tests/cxx/parser/enumeration/test-000.xml @@ -0,0 +1,10 @@ + + + 1 + + male + female + + diff --git a/tests/cxx/parser/enumeration/test.xml b/tests/cxx/parser/enumeration/test.xml deleted file mode 100644 index a6fa893..0000000 --- a/tests/cxx/parser/enumeration/test.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - 1 - - male - female - - diff --git a/tests/cxx/parser/error-handling/codes/makefile b/tests/cxx/parser/error-handling/codes/makefile index 8f130b1..370db75 100644 --- a/tests/cxx/parser/error-handling/codes/makefile +++ b/tests/cxx/parser/error-handling/codes/makefile @@ -43,8 +43,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/error-handling/codes/output b/tests/cxx/parser/error-handling/codes/output deleted file mode 100644 index bdf6520..0000000 --- a/tests/cxx/parser/error-handling/codes/output +++ /dev/null @@ -1,15 +0,0 @@ -xml:2:2: 7: mismatched tag -app: 1 -app:7:11: 2 -app: 3 -app:5:19: 4 -app:5:19: 5 -app:6:17: 6 -app:7:11: 7 -schema:1:22: 4: unexpected element encountered -schema:2:16: 3: expected element not encountered -schema:2:30: 1: expected attribute not encountered -schema:4:6: 4: unexpected element encountered -schema:2:23: 2: unexpected attribute encountered -schema:3:14: 11: invalid int value -sys: 2: open failed diff --git a/tests/cxx/parser/error-handling/codes/test-000.std b/tests/cxx/parser/error-handling/codes/test-000.std new file mode 100644 index 0000000..bdf6520 --- /dev/null +++ b/tests/cxx/parser/error-handling/codes/test-000.std @@ -0,0 +1,15 @@ +xml:2:2: 7: mismatched tag +app: 1 +app:7:11: 2 +app: 3 +app:5:19: 4 +app:5:19: 5 +app:6:17: 6 +app:7:11: 7 +schema:1:22: 4: unexpected element encountered +schema:2:16: 3: expected element not encountered +schema:2:30: 1: expected attribute not encountered +schema:4:6: 4: unexpected element encountered +schema:2:23: 2: unexpected attribute encountered +schema:3:14: 11: invalid int value +sys: 2: open failed diff --git a/tests/cxx/parser/error-handling/codes/test-000.xml b/tests/cxx/parser/error-handling/codes/test-000.xml new file mode 100644 index 0000000..07def4b --- /dev/null +++ b/tests/cxx/parser/error-handling/codes/test-000.xml @@ -0,0 +1,9 @@ + + + + 67 + + + diff --git a/tests/cxx/parser/error-handling/codes/test.xml b/tests/cxx/parser/error-handling/codes/test.xml deleted file mode 100644 index 07def4b..0000000 --- a/tests/cxx/parser/error-handling/codes/test.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - 67 - - - diff --git a/tests/cxx/parser/error-handling/exceptions/makefile b/tests/cxx/parser/error-handling/exceptions/makefile index 7503803..e1a038c 100644 --- a/tests/cxx/parser/error-handling/exceptions/makefile +++ b/tests/cxx/parser/error-handling/exceptions/makefile @@ -44,8 +44,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/error-handling/exceptions/output b/tests/cxx/parser/error-handling/exceptions/output deleted file mode 100644 index b8046aa..0000000 --- a/tests/cxx/parser/error-handling/exceptions/output +++ /dev/null @@ -1,15 +0,0 @@ -xml:2:2: 7: mismatched tag -app: 1 -app: 2 -app: 3 -app: 4 -app: 5 -app: 6 -app: 7 -schema:1:22: 4: unexpected element encountered -schema:2:16: 3: expected element not encountered -schema:2:30: 1: expected attribute not encountered -schema:4:6: 4: unexpected element encountered -schema:2:23: 2: unexpected attribute encountered -schema:3:14: 11: invalid int value -io: io error diff --git a/tests/cxx/parser/error-handling/exceptions/test-000.std b/tests/cxx/parser/error-handling/exceptions/test-000.std new file mode 100644 index 0000000..b8046aa --- /dev/null +++ b/tests/cxx/parser/error-handling/exceptions/test-000.std @@ -0,0 +1,15 @@ +xml:2:2: 7: mismatched tag +app: 1 +app: 2 +app: 3 +app: 4 +app: 5 +app: 6 +app: 7 +schema:1:22: 4: unexpected element encountered +schema:2:16: 3: expected element not encountered +schema:2:30: 1: expected attribute not encountered +schema:4:6: 4: unexpected element encountered +schema:2:23: 2: unexpected attribute encountered +schema:3:14: 11: invalid int value +io: io error diff --git a/tests/cxx/parser/error-handling/exceptions/test-000.xml b/tests/cxx/parser/error-handling/exceptions/test-000.xml new file mode 100644 index 0000000..07def4b --- /dev/null +++ b/tests/cxx/parser/error-handling/exceptions/test-000.xml @@ -0,0 +1,9 @@ + + + + 67 + + + diff --git a/tests/cxx/parser/error-handling/exceptions/test.xml b/tests/cxx/parser/error-handling/exceptions/test.xml deleted file mode 100644 index 07def4b..0000000 --- a/tests/cxx/parser/error-handling/exceptions/test.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - 67 - - - diff --git a/tests/cxx/parser/generated-impl/makefile b/tests/cxx/parser/generated-impl/makefile index 49ed042..7d5d6f6 100644 --- a/tests/cxx/parser/generated-impl/makefile +++ b/tests/cxx/parser/generated-impl/makefile @@ -44,8 +44,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/generated-impl/output b/tests/cxx/parser/generated-impl/output deleted file mode 100644 index 7c58647..0000000 --- a/tests/cxx/parser/generated-impl/output +++ /dev/null @@ -1,122 +0,0 @@ -gender: male -foo: foo -gender: male -int: 0 -int: 1 -int: 2 -int: 3 -foo: foo -int: 3 -int: 2 -int: 1 -int: 0 -union: 9 -foo: foo -union: string -x: x -a: aaa -x: x -y: y -a: aaa -b: bbb -boolean: 1 -boolean: 0 -boolean: 1 -boolean: 0 -byte: 0 -byte: 123 -byte: -123 -unsigned-byte: 0 -unsigned-byte: 123 -short: 0 -short: -1234 -short: 1234 -unsigned-short: 0 -unsigned-short: 1234 -int: 0 -int: -12345 -int: 12345 -unsigned-int: 0 -unsigned-int: 12345 -long: 0 -long: -123456 -long: 123456 -unsigned-long: 0 -unsigned-long: 123456 -integer: 0 -integer: -123456 -integer: 123456 -negative-integer: -123456 -non-positive-integer: 0 -non-positive-integer: -123456 -positive-integer: 123456 -non-negative-integer: 0 -non-negative-integer: 123456 -float: 0 -float: 1.123 -float: -1.123 -double: 0 -double: 1.1234 -double: -1.1234 -decimal: 0 -decimal: 1.1234 -decimal: -1.1234 -string: string space newline -normalized-string: string space newline -token: string space newline -name: as123:345-.abs -nmtoken: 1as123:345-.abs -nmtokens: abc 123 -ncname: as123_345-.abs -id: abc -id: a123 -idref: abc -idrefs: abc a123 -language: en -language: en-us -uri: http://www.example.com/foo#bar -qname: schemaLocation -qname: xsi:schemaLocation -base64_binary: 10 bytes -base64_binary: 1 bytes -base64_binary: 2 bytes -base64_binary: 3 bytes -hex_binary: 0 bytes -hex_binary: 10 bytes -gday: ---12+12:0 -gday: ---1 -gday: ---31 -gday: ---15+0:0 -gday: ---15-14:0 -gmonth: --10+12:0 -gmonth: --1 -gmonth: --12+0:0 -gyear: 2007+12:0 -gyear: 1 -gyear: -20000+0:0 -gmonth_day: --10-28+12:0 -gmonth_day: --12-31 -gmonth_day: --1-1+0:0 -gyear_month: 2007-12+12:0 -gyear_month: -2007-10 -gyear_month: 20007-10+0:0 -gyear_month: -20007-1 -date: 2007-12-26+12:0 -date: -2007-10-15 -date: 20007-12-31+0:0 -date: -20007-1-1 -time: 12:46:23.456+12:0 -time: 12:13:14 -time: 12:13:14+0:0 -date_time: 2007-12-26T12:13:14.123+12:0 -date_time: -2007-10-15T12:13:14 -date_time: 20007-12-31T12:13:14+0:0 -date_time: -20007-1-1T12:13:14 -duration: -P2007Y13M32DT25H61M61.123S -duration: P1Y0M0DT0H0M0S -duration: P0Y1M0DT0H0M0S -duration: P0Y0M1DT0H0M0S -duration: P0Y0M0DT1H0M0S -duration: P0Y0M0DT0H1M0S -duration: P0Y0M0DT0H0M1.1S -duration: P1Y0M0DT0H0M1S diff --git a/tests/cxx/parser/generated-impl/test-000.std b/tests/cxx/parser/generated-impl/test-000.std new file mode 100644 index 0000000..7c58647 --- /dev/null +++ b/tests/cxx/parser/generated-impl/test-000.std @@ -0,0 +1,122 @@ +gender: male +foo: foo +gender: male +int: 0 +int: 1 +int: 2 +int: 3 +foo: foo +int: 3 +int: 2 +int: 1 +int: 0 +union: 9 +foo: foo +union: string +x: x +a: aaa +x: x +y: y +a: aaa +b: bbb +boolean: 1 +boolean: 0 +boolean: 1 +boolean: 0 +byte: 0 +byte: 123 +byte: -123 +unsigned-byte: 0 +unsigned-byte: 123 +short: 0 +short: -1234 +short: 1234 +unsigned-short: 0 +unsigned-short: 1234 +int: 0 +int: -12345 +int: 12345 +unsigned-int: 0 +unsigned-int: 12345 +long: 0 +long: -123456 +long: 123456 +unsigned-long: 0 +unsigned-long: 123456 +integer: 0 +integer: -123456 +integer: 123456 +negative-integer: -123456 +non-positive-integer: 0 +non-positive-integer: -123456 +positive-integer: 123456 +non-negative-integer: 0 +non-negative-integer: 123456 +float: 0 +float: 1.123 +float: -1.123 +double: 0 +double: 1.1234 +double: -1.1234 +decimal: 0 +decimal: 1.1234 +decimal: -1.1234 +string: string space newline +normalized-string: string space newline +token: string space newline +name: as123:345-.abs +nmtoken: 1as123:345-.abs +nmtokens: abc 123 +ncname: as123_345-.abs +id: abc +id: a123 +idref: abc +idrefs: abc a123 +language: en +language: en-us +uri: http://www.example.com/foo#bar +qname: schemaLocation +qname: xsi:schemaLocation +base64_binary: 10 bytes +base64_binary: 1 bytes +base64_binary: 2 bytes +base64_binary: 3 bytes +hex_binary: 0 bytes +hex_binary: 10 bytes +gday: ---12+12:0 +gday: ---1 +gday: ---31 +gday: ---15+0:0 +gday: ---15-14:0 +gmonth: --10+12:0 +gmonth: --1 +gmonth: --12+0:0 +gyear: 2007+12:0 +gyear: 1 +gyear: -20000+0:0 +gmonth_day: --10-28+12:0 +gmonth_day: --12-31 +gmonth_day: --1-1+0:0 +gyear_month: 2007-12+12:0 +gyear_month: -2007-10 +gyear_month: 20007-10+0:0 +gyear_month: -20007-1 +date: 2007-12-26+12:0 +date: -2007-10-15 +date: 20007-12-31+0:0 +date: -20007-1-1 +time: 12:46:23.456+12:0 +time: 12:13:14 +time: 12:13:14+0:0 +date_time: 2007-12-26T12:13:14.123+12:0 +date_time: -2007-10-15T12:13:14 +date_time: 20007-12-31T12:13:14+0:0 +date_time: -20007-1-1T12:13:14 +duration: -P2007Y13M32DT25H61M61.123S +duration: P1Y0M0DT0H0M0S +duration: P0Y1M0DT0H0M0S +duration: P0Y0M1DT0H0M0S +duration: P0Y0M0DT1H0M0S +duration: P0Y0M0DT0H1M0S +duration: P0Y0M0DT0H0M1.1S +duration: P1Y0M0DT0H0M1S diff --git a/tests/cxx/parser/generated-impl/test-000.xml b/tests/cxx/parser/generated-impl/test-000.xml new file mode 100644 index 0000000..2f29a39 --- /dev/null +++ b/tests/cxx/parser/generated-impl/test-000.xml @@ -0,0 +1,168 @@ + + + male + male + + 0 1 2 3 + 3 2 1 0 + + 9 + string + + + aaa + + + + aaa + bbb + + + aaabbbccc + abc123 + + 1 + 0 + true + false + + 0 + 123 + -123 + + 0 + 123 + + 0 + -1234 + 1234 + + 0 + 1234 + + 0 + -12345 + 12345 + + 0 + 12345 + + 0 + -123456 + 123456 + + 0 + 123456 + + 0 + -123456 + 123456 + + -123456 + + 0 + -123456 + + 123456 + + 0 + 123456 + + 0 + 1.123 + -1.123 + + 0 + 1.1234 + -1.1234 + + 0 + 1.1234 + -1.1234 + + string space newline + + string space newline + + string space newline + + as123:345-.abs + + 1as123:345-.abs + + abc 123 + + as123_345-.abs + + abc + a123 + + abc + + abc a123 + + en + en-us + + http://www.example.com/foo#bar + + schemaLocation + xsi:schemaLocation + + MTIzNDVhYmNqaw== + YQ== + YWI= + YWJj + + + 31323334356162636a6b + + ---12+12:00 + ---01 + ---31 + ---15Z + ---15-14:00 + + --10+12:00 + --01 + --12Z + + 2007+12:00 + 0001 + -20000Z + + --10-28+12:00 + --12-31 + --01-01Z + + 2007-12+12:00 + -2007-10 + 20007-10Z + -20007-01 + + 2007-12-26+12:00 + -2007-10-15 + 20007-12-31Z + -20007-01-01 + + + + + + 2007-12-26T12:13:14.123+12:00 + -2007-10-15T12:13:14 + 20007-12-31T12:13:14Z + -20007-01-01T12:13:14 + + -P2007Y13M32DT25H61M61.123S + P1Y + P1M + P1D + PT1H + PT1M + PT1.1S + P1YT1S + + diff --git a/tests/cxx/parser/generated-impl/test.xml b/tests/cxx/parser/generated-impl/test.xml deleted file mode 100644 index 2f29a39..0000000 --- a/tests/cxx/parser/generated-impl/test.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - male - male - - 0 1 2 3 - 3 2 1 0 - - 9 - string - - - aaa - - - - aaa - bbb - - - aaabbbccc - abc123 - - 1 - 0 - true - false - - 0 - 123 - -123 - - 0 - 123 - - 0 - -1234 - 1234 - - 0 - 1234 - - 0 - -12345 - 12345 - - 0 - 12345 - - 0 - -123456 - 123456 - - 0 - 123456 - - 0 - -123456 - 123456 - - -123456 - - 0 - -123456 - - 123456 - - 0 - 123456 - - 0 - 1.123 - -1.123 - - 0 - 1.1234 - -1.1234 - - 0 - 1.1234 - -1.1234 - - string space newline - - string space newline - - string space newline - - as123:345-.abs - - 1as123:345-.abs - - abc 123 - - as123_345-.abs - - abc - a123 - - abc - - abc a123 - - en - en-us - - http://www.example.com/foo#bar - - schemaLocation - xsi:schemaLocation - - MTIzNDVhYmNqaw== - YQ== - YWI= - YWJj - - - 31323334356162636a6b - - ---12+12:00 - ---01 - ---31 - ---15Z - ---15-14:00 - - --10+12:00 - --01 - --12Z - - 2007+12:00 - 0001 - -20000Z - - --10-28+12:00 - --12-31 - --01-01Z - - 2007-12+12:00 - -2007-10 - 20007-10Z - -20007-01 - - 2007-12-26+12:00 - -2007-10-15 - 20007-12-31Z - -20007-01-01 - - - - - - 2007-12-26T12:13:14.123+12:00 - -2007-10-15T12:13:14 - 20007-12-31T12:13:14Z - -20007-01-01T12:13:14 - - -P2007Y13M32DT25H61M61.123S - P1Y - P1M - P1D - PT1H - PT1M - PT1.1S - P1YT1S - - diff --git a/tests/cxx/parser/list/makefile b/tests/cxx/parser/list/makefile index 0624da0..e709106 100644 --- a/tests/cxx/parser/list/makefile +++ b/tests/cxx/parser/list/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/list/output b/tests/cxx/parser/list/output deleted file mode 100644 index 3642c4d..0000000 --- a/tests/cxx/parser/list/output +++ /dev/null @@ -1,26 +0,0 @@ -{ -} - -{ -} - -{ -} - -{ - 'one' -} - -{ - 'one' - 'two' - 'three' -} - -{ - lang: 'en' - 'one' - 'two' - 'three' -} - diff --git a/tests/cxx/parser/list/test-000.std b/tests/cxx/parser/list/test-000.std new file mode 100644 index 0000000..3642c4d --- /dev/null +++ b/tests/cxx/parser/list/test-000.std @@ -0,0 +1,26 @@ +{ +} + +{ +} + +{ +} + +{ + 'one' +} + +{ + 'one' + 'two' + 'three' +} + +{ + lang: 'en' + 'one' + 'two' + 'three' +} + diff --git a/tests/cxx/parser/list/test-000.xml b/tests/cxx/parser/list/test-000.xml new file mode 100644 index 0000000..52229db --- /dev/null +++ b/tests/cxx/parser/list/test-000.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + one + + + one two + three + + + + one two + three + + + diff --git a/tests/cxx/parser/list/test.xml b/tests/cxx/parser/list/test.xml deleted file mode 100644 index 52229db..0000000 --- a/tests/cxx/parser/list/test.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - one - - - one two - three - - - - one two - three - - - diff --git a/tests/cxx/parser/name-clash/inheritance/makefile b/tests/cxx/parser/name-clash/inheritance/makefile index b05a021..56599cd 100644 --- a/tests/cxx/parser/name-clash/inheritance/makefile +++ b/tests/cxx/parser/name-clash/inheritance/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/name-clash/inheritance/output b/tests/cxx/parser/name-clash/inheritance/output deleted file mode 100644 index 4efd51b..0000000 --- a/tests/cxx/parser/name-clash/inheritance/output +++ /dev/null @@ -1,2 +0,0 @@ -e: e -e1: e1 diff --git a/tests/cxx/parser/name-clash/inheritance/test-000.std b/tests/cxx/parser/name-clash/inheritance/test-000.std new file mode 100644 index 0000000..4efd51b --- /dev/null +++ b/tests/cxx/parser/name-clash/inheritance/test-000.std @@ -0,0 +1,2 @@ +e: e +e1: e1 diff --git a/tests/cxx/parser/name-clash/inheritance/test-000.xml b/tests/cxx/parser/name-clash/inheritance/test-000.xml new file mode 100644 index 0000000..8c17101 --- /dev/null +++ b/tests/cxx/parser/name-clash/inheritance/test-000.xml @@ -0,0 +1,8 @@ + + + e + e1 + + diff --git a/tests/cxx/parser/name-clash/inheritance/test.xml b/tests/cxx/parser/name-clash/inheritance/test.xml deleted file mode 100644 index 8c17101..0000000 --- a/tests/cxx/parser/name-clash/inheritance/test.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - e - e1 - - diff --git a/tests/cxx/parser/polymorphism/makefile b/tests/cxx/parser/polymorphism/makefile index 6ffff5f..e60f68e 100644 --- a/tests/cxx/parser/polymorphism/makefile +++ b/tests/cxx/parser/polymorphism/makefile @@ -42,8 +42,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/polymorphism/output b/tests/cxx/parser/polymorphism/output deleted file mode 100644 index 87168ca..0000000 --- a/tests/cxx/parser/polymorphism/output +++ /dev/null @@ -1,14 +0,0 @@ -a: 1 -a: 1 -b: 2 -a: 1 -b: 2 -a: 1 -b: 2 -c: 3 -a: 1 -b: 2 -c: 3 -a: 1 -a: 1 -a: 1 diff --git a/tests/cxx/parser/polymorphism/test-000.std b/tests/cxx/parser/polymorphism/test-000.std new file mode 100644 index 0000000..87168ca --- /dev/null +++ b/tests/cxx/parser/polymorphism/test-000.std @@ -0,0 +1,14 @@ +a: 1 +a: 1 +b: 2 +a: 1 +b: 2 +a: 1 +b: 2 +c: 3 +a: 1 +b: 2 +c: 3 +a: 1 +a: 1 +a: 1 diff --git a/tests/cxx/parser/polymorphism/test-000.xml b/tests/cxx/parser/polymorphism/test-000.xml new file mode 100644 index 0000000..8e635cc --- /dev/null +++ b/tests/cxx/parser/polymorphism/test-000.xml @@ -0,0 +1,19 @@ + + + 1 + + 12 + 12 + + 123 + 123 + + + + 1 + 1 + 1 + + diff --git a/tests/cxx/parser/polymorphism/test.xml b/tests/cxx/parser/polymorphism/test.xml deleted file mode 100644 index 8e635cc..0000000 --- a/tests/cxx/parser/polymorphism/test.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - 1 - - 12 - 12 - - 123 - 123 - - - - 1 - 1 - 1 - - diff --git a/tests/cxx/parser/recursive/makefile b/tests/cxx/parser/recursive/makefile index e61f71f..722bae6 100644 --- a/tests/cxx/parser/recursive/makefile +++ b/tests/cxx/parser/recursive/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. diff --git a/tests/cxx/parser/recursive/output b/tests/cxx/parser/recursive/output deleted file mode 100644 index f26fb72..0000000 --- a/tests/cxx/parser/recursive/output +++ /dev/null @@ -1,22 +0,0 @@ -test::pre -test::name: testName -sub::pre -sub::name: subName -sub::pre -sub::name: sub-subName -sub::post -sub::sub -indir::pre -indir::name: sub-indirName -sub::pre -sub::name: sub-indir-subName -sub::post -indir::sub -indir::post -sub::pre -sub::name: sub-sub2Name -sub::post -sub::sub2 -sub::post -test::sub -test::post diff --git a/tests/cxx/parser/recursive/test-000.std b/tests/cxx/parser/recursive/test-000.std new file mode 100644 index 0000000..f26fb72 --- /dev/null +++ b/tests/cxx/parser/recursive/test-000.std @@ -0,0 +1,22 @@ +test::pre +test::name: testName +sub::pre +sub::name: subName +sub::pre +sub::name: sub-subName +sub::post +sub::sub +indir::pre +indir::name: sub-indirName +sub::pre +sub::name: sub-indir-subName +sub::post +indir::sub +indir::post +sub::pre +sub::name: sub-sub2Name +sub::post +sub::sub2 +sub::post +test::sub +test::post diff --git a/tests/cxx/parser/recursive/test-000.xml b/tests/cxx/parser/recursive/test-000.xml new file mode 100644 index 0000000..f6c219d --- /dev/null +++ b/tests/cxx/parser/recursive/test-000.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/tests/cxx/parser/recursive/test.xml b/tests/cxx/parser/recursive/test.xml deleted file mode 100644 index f6c219d..0000000 --- a/tests/cxx/parser/recursive/test.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/tests/cxx/parser/reset/makefile b/tests/cxx/parser/reset/makefile index b4118f9..c1d683c 100644 --- a/tests/cxx/parser/reset/makefile +++ b/tests/cxx/parser/reset/makefile @@ -42,10 +42,10 @@ $(out_base)/: $(driver) # $(test): driver := $(driver) $(test): $(driver) $(src_base)/pass.xml $(src_base)/fail-xml.xml \ - $(src_base)/fail-schema.xml $(src_base)/output + $(src_base)/fail-schema.xml $(src_base)/test.std $(call message,test $$1,$$1 $(src_base)/pass.xml \ $(src_base)/fail-xml.xml $(src_base)/fail-schema.xml \ -| diff -u $(src_base)/output -,$(driver)) +| diff -u $(src_base)/test.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/reset/output b/tests/cxx/parser/reset/output deleted file mode 100644 index 0e6cb1e..0000000 --- a/tests/cxx/parser/reset/output +++ /dev/null @@ -1,8 +0,0 @@ -0: 1 -1: 1 -2: 1 -3: 1 -4: 1 -5: 1 -6: 1 -7: 1 diff --git a/tests/cxx/parser/reset/test.std b/tests/cxx/parser/reset/test.std new file mode 100644 index 0000000..0e6cb1e --- /dev/null +++ b/tests/cxx/parser/reset/test.std @@ -0,0 +1,8 @@ +0: 1 +1: 1 +2: 1 +3: 1 +4: 1 +5: 1 +6: 1 +7: 1 diff --git a/tests/cxx/parser/test-template/makefile b/tests/cxx/parser/test-template/makefile index ea42416..3d95a16 100644 --- a/tests/cxx/parser/test-template/makefile +++ b/tests/cxx/parser/test-template/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/test-template/output b/tests/cxx/parser/test-template/output deleted file mode 100644 index 7898192..0000000 --- a/tests/cxx/parser/test-template/output +++ /dev/null @@ -1 +0,0 @@ -a diff --git a/tests/cxx/parser/test-template/test-000.std b/tests/cxx/parser/test-template/test-000.std new file mode 100644 index 0000000..7898192 --- /dev/null +++ b/tests/cxx/parser/test-template/test-000.std @@ -0,0 +1 @@ +a diff --git a/tests/cxx/parser/test-template/test-000.xml b/tests/cxx/parser/test-template/test-000.xml new file mode 100644 index 0000000..624a80c --- /dev/null +++ b/tests/cxx/parser/test-template/test-000.xml @@ -0,0 +1,7 @@ + + + a + + diff --git a/tests/cxx/parser/test-template/test.xml b/tests/cxx/parser/test-template/test.xml deleted file mode 100644 index 624a80c..0000000 --- a/tests/cxx/parser/test-template/test.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - a - - diff --git a/tests/cxx/parser/union/makefile b/tests/cxx/parser/union/makefile index 217ac4e..42a14e7 100644 --- a/tests/cxx/parser/union/makefile +++ b/tests/cxx/parser/union/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/union/output b/tests/cxx/parser/union/output deleted file mode 100644 index b698505..0000000 --- a/tests/cxx/parser/union/output +++ /dev/null @@ -1,3 +0,0 @@ -' ' -'one' -'1' diff --git a/tests/cxx/parser/union/test-000.std b/tests/cxx/parser/union/test-000.std new file mode 100644 index 0000000..b698505 --- /dev/null +++ b/tests/cxx/parser/union/test-000.std @@ -0,0 +1,3 @@ +' ' +'one' +'1' diff --git a/tests/cxx/parser/union/test-000.xml b/tests/cxx/parser/union/test-000.xml new file mode 100644 index 0000000..5b3e799 --- /dev/null +++ b/tests/cxx/parser/union/test-000.xml @@ -0,0 +1,10 @@ + + + + + one + 1 + + diff --git a/tests/cxx/parser/union/test.xml b/tests/cxx/parser/union/test.xml deleted file mode 100644 index 5b3e799..0000000 --- a/tests/cxx/parser/union/test.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - one - 1 - - diff --git a/tests/cxx/parser/validation/attribute/makefile b/tests/cxx/parser/validation/attribute/makefile index 7316abc..078ed49 100644 --- a/tests/cxx/parser/validation/attribute/makefile +++ b/tests/cxx/parser/validation/attribute/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.xml $(src_base)/output - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std + $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/parser/validation/attribute/output b/tests/cxx/parser/validation/attribute/output deleted file mode 100644 index 990f995..0000000 --- a/tests/cxx/parser/validation/attribute/output +++ /dev/null @@ -1,24 +0,0 @@ -pass-a -{ - b = b - any: test#foo = foo - any: test#bar = bar -} - -pass-b -{ - a = a - b = b -} - -pass-c -{ - a = a - b = b -} - -fail -{ - 8:9 expected attribute not encountered -} - diff --git a/tests/cxx/parser/validation/attribute/test-000.std b/tests/cxx/parser/validation/attribute/test-000.std new file mode 100644 index 0000000..990f995 --- /dev/null +++ b/tests/cxx/parser/validation/attribute/test-000.std @@ -0,0 +1,24 @@ +pass-a +{ + b = b + any: test#foo = foo + any: test#bar = bar +} + +pass-b +{ + a = a + b = b +} + +pass-c +{ + a = a + b = b +} + +fail +{ + 8:9 expected attribute not encountered +} + diff --git a/tests/cxx/parser/validation/attribute/test-000.xml b/tests/cxx/parser/validation/attribute/test-000.xml new file mode 100644 index 0000000..b994d1a --- /dev/null +++ b/tests/cxx/parser/validation/attribute/test-000.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/tests/cxx/parser/validation/attribute/test.xml b/tests/cxx/parser/validation/attribute/test.xml deleted file mode 100644 index b994d1a..0000000 --- a/tests/cxx/parser/validation/attribute/test.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/tests/cxx/serializer/all/makefile b/tests/cxx/serializer/all/makefile index 6dd097f..260cc30 100644 --- a/tests/cxx/serializer/all/makefile +++ b/tests/cxx/serializer/all/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/all/output b/tests/cxx/serializer/all/output deleted file mode 100644 index ec04b95..0000000 --- a/tests/cxx/serializer/all/output +++ /dev/null @@ -1 +0,0 @@ -123234123234 \ No newline at end of file diff --git a/tests/cxx/serializer/all/test-000.std b/tests/cxx/serializer/all/test-000.std new file mode 100644 index 0000000..ec04b95 --- /dev/null +++ b/tests/cxx/serializer/all/test-000.std @@ -0,0 +1 @@ +123234123234 \ No newline at end of file diff --git a/tests/cxx/serializer/choice/makefile b/tests/cxx/serializer/choice/makefile index d2f363b..964345a 100644 --- a/tests/cxx/serializer/choice/makefile +++ b/tests/cxx/serializer/choice/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/choice/output b/tests/cxx/serializer/choice/output deleted file mode 100644 index 78a615a..0000000 --- a/tests/cxx/serializer/choice/output +++ /dev/null @@ -1 +0,0 @@ -123234123234123234123234123234345456 \ No newline at end of file diff --git a/tests/cxx/serializer/choice/test-000.std b/tests/cxx/serializer/choice/test-000.std new file mode 100644 index 0000000..78a615a --- /dev/null +++ b/tests/cxx/serializer/choice/test-000.std @@ -0,0 +1 @@ +123234123234123234123234123234345456 \ No newline at end of file diff --git a/tests/cxx/serializer/complex/makefile b/tests/cxx/serializer/complex/makefile index c1c6c70..fddcbc4 100644 --- a/tests/cxx/serializer/complex/makefile +++ b/tests/cxx/serializer/complex/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/complex/output b/tests/cxx/serializer/complex/output deleted file mode 100644 index 82a19b6..0000000 --- a/tests/cxx/serializer/complex/output +++ /dev/null @@ -1 +0,0 @@ --123-234-123-234-345 \ No newline at end of file diff --git a/tests/cxx/serializer/complex/test-000.std b/tests/cxx/serializer/complex/test-000.std new file mode 100644 index 0000000..82a19b6 --- /dev/null +++ b/tests/cxx/serializer/complex/test-000.std @@ -0,0 +1 @@ +-123-234-123-234-345 \ No newline at end of file diff --git a/tests/cxx/serializer/enumeration/makefile b/tests/cxx/serializer/enumeration/makefile index 981acbc..33e5594 100644 --- a/tests/cxx/serializer/enumeration/makefile +++ b/tests/cxx/serializer/enumeration/makefile @@ -44,8 +44,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/enumeration/output b/tests/cxx/serializer/enumeration/output deleted file mode 100644 index 4907042..0000000 --- a/tests/cxx/serializer/enumeration/output +++ /dev/null @@ -1 +0,0 @@ -71 \ No newline at end of file diff --git a/tests/cxx/serializer/enumeration/test-000.std b/tests/cxx/serializer/enumeration/test-000.std new file mode 100644 index 0000000..4907042 --- /dev/null +++ b/tests/cxx/serializer/enumeration/test-000.std @@ -0,0 +1 @@ +71 \ No newline at end of file diff --git a/tests/cxx/serializer/error-handling/codes/makefile b/tests/cxx/serializer/error-handling/codes/makefile index e3a95b6..3985a4b 100644 --- a/tests/cxx/serializer/error-handling/codes/makefile +++ b/tests/cxx/serializer/error-handling/codes/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/error-handling/codes/output b/tests/cxx/serializer/error-handling/codes/output deleted file mode 100644 index c01aab9..0000000 --- a/tests/cxx/serializer/error-handling/codes/output +++ /dev/null @@ -1,20 +0,0 @@ -app: 1 -app: 2 -app: 3 -app: 4 -app: 5 -app: 6 -app: 7 -app: 8 -app: 9 -app: 10 -app: 11 -app: 12 -app: 13 -app: 14 -app: 15 -app: 16 -app: 17 -xml: 3: illegal name -xml: 8: call out of sequence -sys: 4: write failed diff --git a/tests/cxx/serializer/error-handling/codes/test-000.std b/tests/cxx/serializer/error-handling/codes/test-000.std new file mode 100644 index 0000000..c01aab9 --- /dev/null +++ b/tests/cxx/serializer/error-handling/codes/test-000.std @@ -0,0 +1,20 @@ +app: 1 +app: 2 +app: 3 +app: 4 +app: 5 +app: 6 +app: 7 +app: 8 +app: 9 +app: 10 +app: 11 +app: 12 +app: 13 +app: 14 +app: 15 +app: 16 +app: 17 +xml: 3: illegal name +xml: 8: call out of sequence +sys: 4: write failed diff --git a/tests/cxx/serializer/error-handling/exceptions/makefile b/tests/cxx/serializer/error-handling/exceptions/makefile index 3175690..eed922f 100644 --- a/tests/cxx/serializer/error-handling/exceptions/makefile +++ b/tests/cxx/serializer/error-handling/exceptions/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/error-handling/exceptions/output b/tests/cxx/serializer/error-handling/exceptions/output deleted file mode 100644 index e640bd6..0000000 --- a/tests/cxx/serializer/error-handling/exceptions/output +++ /dev/null @@ -1,20 +0,0 @@ -app: 1 -app: 2 -app: 3 -app: 4 -app: 5 -app: 6 -app: 7 -app: 8 -app: 9 -app: 10 -app: 11 -app: 12 -app: 13 -app: 14 -app: 15 -app: 16 -app: 17 -xml: illegal name -xml: call out of sequence -sys: write failed diff --git a/tests/cxx/serializer/error-handling/exceptions/test-000.std b/tests/cxx/serializer/error-handling/exceptions/test-000.std new file mode 100644 index 0000000..e640bd6 --- /dev/null +++ b/tests/cxx/serializer/error-handling/exceptions/test-000.std @@ -0,0 +1,20 @@ +app: 1 +app: 2 +app: 3 +app: 4 +app: 5 +app: 6 +app: 7 +app: 8 +app: 9 +app: 10 +app: 11 +app: 12 +app: 13 +app: 14 +app: 15 +app: 16 +app: 17 +xml: illegal name +xml: call out of sequence +sys: write failed diff --git a/tests/cxx/serializer/generated-driver/makefile b/tests/cxx/serializer/generated-driver/makefile index 44e41db..0e043b2 100644 --- a/tests/cxx/serializer/generated-driver/makefile +++ b/tests/cxx/serializer/generated-driver/makefile @@ -43,8 +43,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/generated-driver/output b/tests/cxx/serializer/generated-driver/output deleted file mode 100644 index d544e67..0000000 --- a/tests/cxx/serializer/generated-driver/output +++ /dev/null @@ -1 +0,0 @@ -123 \ No newline at end of file diff --git a/tests/cxx/serializer/generated-driver/test-000.std b/tests/cxx/serializer/generated-driver/test-000.std new file mode 100644 index 0000000..d544e67 --- /dev/null +++ b/tests/cxx/serializer/generated-driver/test-000.std @@ -0,0 +1 @@ +123 \ No newline at end of file diff --git a/tests/cxx/serializer/list/makefile b/tests/cxx/serializer/list/makefile index 12c913c..cef767c 100644 --- a/tests/cxx/serializer/list/makefile +++ b/tests/cxx/serializer/list/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/list/output b/tests/cxx/serializer/list/output deleted file mode 100644 index c1ef004..0000000 --- a/tests/cxx/serializer/list/output +++ /dev/null @@ -1 +0,0 @@ -11 2 311 2 3 \ No newline at end of file diff --git a/tests/cxx/serializer/list/test-000.std b/tests/cxx/serializer/list/test-000.std new file mode 100644 index 0000000..c1ef004 --- /dev/null +++ b/tests/cxx/serializer/list/test-000.std @@ -0,0 +1 @@ +11 2 311 2 3 \ No newline at end of file diff --git a/tests/cxx/serializer/polymorphism/makefile b/tests/cxx/serializer/polymorphism/makefile index 4e39343..d13f8c8 100644 --- a/tests/cxx/serializer/polymorphism/makefile +++ b/tests/cxx/serializer/polymorphism/makefile @@ -42,8 +42,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/polymorphism/output b/tests/cxx/serializer/polymorphism/output deleted file mode 100644 index 5107439..0000000 --- a/tests/cxx/serializer/polymorphism/output +++ /dev/null @@ -1 +0,0 @@ -11212123123 \ No newline at end of file diff --git a/tests/cxx/serializer/polymorphism/test-000.std b/tests/cxx/serializer/polymorphism/test-000.std new file mode 100644 index 0000000..5107439 --- /dev/null +++ b/tests/cxx/serializer/polymorphism/test-000.std @@ -0,0 +1 @@ +11212123123 \ No newline at end of file diff --git a/tests/cxx/serializer/recursive/makefile b/tests/cxx/serializer/recursive/makefile index 2f9da28..7000f22 100644 --- a/tests/cxx/serializer/recursive/makefile +++ b/tests/cxx/serializer/recursive/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/recursive/output b/tests/cxx/serializer/recursive/output deleted file mode 100644 index 717654f..0000000 --- a/tests/cxx/serializer/recursive/output +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/tests/cxx/serializer/recursive/test-000.std b/tests/cxx/serializer/recursive/test-000.std new file mode 100644 index 0000000..717654f --- /dev/null +++ b/tests/cxx/serializer/recursive/test-000.std @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/tests/cxx/serializer/reset/makefile b/tests/cxx/serializer/reset/makefile index af6a994..7906a09 100644 --- a/tests/cxx/serializer/reset/makefile +++ b/tests/cxx/serializer/reset/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/reset/output b/tests/cxx/serializer/reset/output deleted file mode 100644 index 8e0b569..0000000 --- a/tests/cxx/serializer/reset/output +++ /dev/null @@ -1,7 +0,0 @@ -0: 1 -1: 1 -2: 1 -3: 1 -4: 1 -5: 1 -6: 1 diff --git a/tests/cxx/serializer/reset/test-000.std b/tests/cxx/serializer/reset/test-000.std new file mode 100644 index 0000000..8e0b569 --- /dev/null +++ b/tests/cxx/serializer/reset/test-000.std @@ -0,0 +1,7 @@ +0: 1 +1: 1 +2: 1 +3: 1 +4: 1 +5: 1 +6: 1 diff --git a/tests/cxx/serializer/restriction/makefile b/tests/cxx/serializer/restriction/makefile index 8993324..3b738f0 100644 --- a/tests/cxx/serializer/restriction/makefile +++ b/tests/cxx/serializer/restriction/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/restriction/output b/tests/cxx/serializer/restriction/output deleted file mode 100644 index 6cb29b4..0000000 --- a/tests/cxx/serializer/restriction/output +++ /dev/null @@ -1 +0,0 @@ -12352727 \ No newline at end of file diff --git a/tests/cxx/serializer/restriction/test-000.std b/tests/cxx/serializer/restriction/test-000.std new file mode 100644 index 0000000..6cb29b4 --- /dev/null +++ b/tests/cxx/serializer/restriction/test-000.std @@ -0,0 +1 @@ +12352727 \ No newline at end of file diff --git a/tests/cxx/serializer/sequence/makefile b/tests/cxx/serializer/sequence/makefile index 713a332..6c33dba 100644 --- a/tests/cxx/serializer/sequence/makefile +++ b/tests/cxx/serializer/sequence/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/sequence/output b/tests/cxx/serializer/sequence/output deleted file mode 100644 index a76f191..0000000 --- a/tests/cxx/serializer/sequence/output +++ /dev/null @@ -1 +0,0 @@ -123234123123234124235125236126237123234346457347458348459 \ No newline at end of file diff --git a/tests/cxx/serializer/sequence/test-000.std b/tests/cxx/serializer/sequence/test-000.std new file mode 100644 index 0000000..a76f191 --- /dev/null +++ b/tests/cxx/serializer/sequence/test-000.std @@ -0,0 +1 @@ +123234123123234124235125236126237123234346457347458348459 \ No newline at end of file diff --git a/tests/cxx/serializer/test-template/makefile b/tests/cxx/serializer/test-template/makefile index b0fafaf..295fbf5 100644 --- a/tests/cxx/serializer/test-template/makefile +++ b/tests/cxx/serializer/test-template/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/test-template/output b/tests/cxx/serializer/test-template/output deleted file mode 100644 index 509a8ed..0000000 --- a/tests/cxx/serializer/test-template/output +++ /dev/null @@ -1 +0,0 @@ -1234 \ No newline at end of file diff --git a/tests/cxx/serializer/test-template/test-000.std b/tests/cxx/serializer/test-template/test-000.std new file mode 100644 index 0000000..509a8ed --- /dev/null +++ b/tests/cxx/serializer/test-template/test-000.std @@ -0,0 +1 @@ +1234 \ No newline at end of file diff --git a/tests/cxx/serializer/union/makefile b/tests/cxx/serializer/union/makefile index 20c0453..24a007d 100644 --- a/tests/cxx/serializer/union/makefile +++ b/tests/cxx/serializer/union/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/union/output b/tests/cxx/serializer/union/output deleted file mode 100644 index 70363b0..0000000 --- a/tests/cxx/serializer/union/output +++ /dev/null @@ -1 +0,0 @@ -123false123false \ No newline at end of file diff --git a/tests/cxx/serializer/union/test-000.std b/tests/cxx/serializer/union/test-000.std new file mode 100644 index 0000000..70363b0 --- /dev/null +++ b/tests/cxx/serializer/union/test-000.std @@ -0,0 +1 @@ +123false123false \ No newline at end of file diff --git a/tests/cxx/serializer/validation/any/makefile b/tests/cxx/serializer/validation/any/makefile index 5ad09eb..53e61cb 100644 --- a/tests/cxx/serializer/validation/any/makefile +++ b/tests/cxx/serializer/validation/any/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/validation/any/output b/tests/cxx/serializer/validation/any/output deleted file mode 100644 index cf16193..0000000 --- a/tests/cxx/serializer/validation/any/output +++ /dev/null @@ -1,9 +0,0 @@ -schema: expected element not encountered -schema: unexpected element encountered -schema: unexpected element encountered -schema: unexpected element encountered -schema: unexpected element encountered -schema: unexpected element encountered -schema: unexpected element encountered -schema: unexpected element encountered -schema: unexpected element encountered diff --git a/tests/cxx/serializer/validation/any/test-000.std b/tests/cxx/serializer/validation/any/test-000.std new file mode 100644 index 0000000..cf16193 --- /dev/null +++ b/tests/cxx/serializer/validation/any/test-000.std @@ -0,0 +1,9 @@ +schema: expected element not encountered +schema: unexpected element encountered +schema: unexpected element encountered +schema: unexpected element encountered +schema: unexpected element encountered +schema: unexpected element encountered +schema: unexpected element encountered +schema: unexpected element encountered +schema: unexpected element encountered diff --git a/tests/cxx/serializer/validation/attribute/driver.cxx b/tests/cxx/serializer/validation/attribute/driver.cxx index 96a4629..977a61b 100644 --- a/tests/cxx/serializer/validation/attribute/driver.cxx +++ b/tests/cxx/serializer/validation/attribute/driver.cxx @@ -17,7 +17,11 @@ using namespace test; struct test_1_simpl: virtual test_1_sskel { test_1_simpl (int state) - : state_ (state) + : +#ifdef XSDE_REUSE_STYLE_TIEIN + test_1_sskel (0), +#endif + state_ (state) { } diff --git a/tests/cxx/serializer/validation/attribute/makefile b/tests/cxx/serializer/validation/attribute/makefile index e3553fe..4fafac8 100644 --- a/tests/cxx/serializer/validation/attribute/makefile +++ b/tests/cxx/serializer/validation/attribute/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/validation/attribute/output b/tests/cxx/serializer/validation/attribute/output deleted file mode 100644 index 2b9de1e..0000000 --- a/tests/cxx/serializer/validation/attribute/output +++ /dev/null @@ -1,9 +0,0 @@ -schema: expected attribute not encountered -schema: unexpected attribute encountered -schema: unexpected attribute encountered -schema: unexpected attribute encountered -schema: unexpected attribute encountered -schema: unexpected attribute encountered -schema: unexpected attribute encountered -schema: unexpected attribute encountered -schema: unexpected attribute encountered diff --git a/tests/cxx/serializer/validation/attribute/test-000.std b/tests/cxx/serializer/validation/attribute/test-000.std new file mode 100644 index 0000000..2b9de1e --- /dev/null +++ b/tests/cxx/serializer/validation/attribute/test-000.std @@ -0,0 +1,9 @@ +schema: expected attribute not encountered +schema: unexpected attribute encountered +schema: unexpected attribute encountered +schema: unexpected attribute encountered +schema: unexpected attribute encountered +schema: unexpected attribute encountered +schema: unexpected attribute encountered +schema: unexpected attribute encountered +schema: unexpected attribute encountered diff --git a/tests/cxx/serializer/validation/choice/makefile b/tests/cxx/serializer/validation/choice/makefile index b264038..1ab62d6 100644 --- a/tests/cxx/serializer/validation/choice/makefile +++ b/tests/cxx/serializer/validation/choice/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/validation/choice/output b/tests/cxx/serializer/validation/choice/output deleted file mode 100644 index 7ec90f4..0000000 --- a/tests/cxx/serializer/validation/choice/output +++ /dev/null @@ -1,2 +0,0 @@ -schema: expected element not encountered -schema: unexpected element encountered diff --git a/tests/cxx/serializer/validation/choice/test-000.std b/tests/cxx/serializer/validation/choice/test-000.std new file mode 100644 index 0000000..7ec90f4 --- /dev/null +++ b/tests/cxx/serializer/validation/choice/test-000.std @@ -0,0 +1,2 @@ +schema: expected element not encountered +schema: unexpected element encountered diff --git a/tests/cxx/serializer/validation/element/makefile b/tests/cxx/serializer/validation/element/makefile index 04d64f2..7c061d0 100644 --- a/tests/cxx/serializer/validation/element/makefile +++ b/tests/cxx/serializer/validation/element/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/validation/element/output b/tests/cxx/serializer/validation/element/output deleted file mode 100644 index e8e09d0..0000000 --- a/tests/cxx/serializer/validation/element/output +++ /dev/null @@ -1,2 +0,0 @@ -schema: expected element not encountered -schema: expected element not encountered diff --git a/tests/cxx/serializer/validation/element/test-000.std b/tests/cxx/serializer/validation/element/test-000.std new file mode 100644 index 0000000..e8e09d0 --- /dev/null +++ b/tests/cxx/serializer/validation/element/test-000.std @@ -0,0 +1,2 @@ +schema: expected element not encountered +schema: expected element not encountered diff --git a/tests/cxx/serializer/validation/sequence/makefile b/tests/cxx/serializer/validation/sequence/makefile index 55611cd..5667564 100644 --- a/tests/cxx/serializer/validation/sequence/makefile +++ b/tests/cxx/serializer/validation/sequence/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/validation/sequence/output b/tests/cxx/serializer/validation/sequence/output deleted file mode 100644 index 3333a0c..0000000 --- a/tests/cxx/serializer/validation/sequence/output +++ /dev/null @@ -1 +0,0 @@ -schema: expected element not encountered diff --git a/tests/cxx/serializer/validation/sequence/test-000.std b/tests/cxx/serializer/validation/sequence/test-000.std new file mode 100644 index 0000000..3333a0c --- /dev/null +++ b/tests/cxx/serializer/validation/sequence/test-000.std @@ -0,0 +1 @@ +schema: expected element not encountered diff --git a/tests/cxx/serializer/wildcard/driver.cxx b/tests/cxx/serializer/wildcard/driver.cxx index 195c6a0..942fdad 100644 --- a/tests/cxx/serializer/wildcard/driver.cxx +++ b/tests/cxx/serializer/wildcard/driver.cxx @@ -31,6 +31,13 @@ struct content_simpl: virtual content_sskel struct root_simpl: virtual root_sskel { +#ifdef XSDE_REUSE_STYLE_TIEIN + root_simpl () + : root_sskel (0) + { + } +#endif + virtual void pre () { diff --git a/tests/cxx/serializer/wildcard/makefile b/tests/cxx/serializer/wildcard/makefile index dfde14b..1a5e2e9 100644 --- a/tests/cxx/serializer/wildcard/makefile +++ b/tests/cxx/serializer/wildcard/makefile @@ -41,8 +41,8 @@ $(out_base)/: $(driver) # Test. # $(test): driver := $(driver) -$(test): $(driver) $(src_base)/output - $(call message,test $$1,$$1 | diff -u $(src_base)/output -,$(driver)) +$(test): $(driver) $(src_base)/test-000.std + $(call message,test $$1,$$1 | diff -u $(src_base)/test-000.std -,$(driver)) # Clean. # diff --git a/tests/cxx/serializer/wildcard/output b/tests/cxx/serializer/wildcard/output deleted file mode 100644 index a55bc57..0000000 --- a/tests/cxx/serializer/wildcard/output +++ /dev/null @@ -1 +0,0 @@ -321012bar#b \ No newline at end of file diff --git a/tests/cxx/serializer/wildcard/test-000.std b/tests/cxx/serializer/wildcard/test-000.std new file mode 100644 index 0000000..a55bc57 --- /dev/null +++ b/tests/cxx/serializer/wildcard/test-000.std @@ -0,0 +1 @@ +321012bar#b \ No newline at end of file -- cgit v1.1