summaryrefslogtreecommitdiff
path: root/tests/cxx/tree/default
diff options
context:
space:
mode:
Diffstat (limited to 'tests/cxx/tree/default')
-rw-r--r--tests/cxx/tree/default/general/driver.cxx37
-rw-r--r--tests/cxx/tree/default/general/makefile86
-rw-r--r--tests/cxx/tree/default/general/output15
-rw-r--r--tests/cxx/tree/default/general/test.xml16
-rw-r--r--tests/cxx/tree/default/general/test.xsd241
-rw-r--r--tests/cxx/tree/default/makefile16
-rw-r--r--tests/cxx/tree/default/omit/driver.cxx46
-rw-r--r--tests/cxx/tree/default/omit/makefile86
-rw-r--r--tests/cxx/tree/default/omit/output19
-rw-r--r--tests/cxx/tree/default/omit/test.xml9
-rw-r--r--tests/cxx/tree/default/omit/test.xsd30
11 files changed, 0 insertions, 601 deletions
diff --git a/tests/cxx/tree/default/general/driver.cxx b/tests/cxx/tree/default/general/driver.cxx
deleted file mode 100644
index 97d0a7d..0000000
--- a/tests/cxx/tree/default/general/driver.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-// file : tests/cxx/tree/default/general/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test default attribute/element values.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <iostream>
-
-#include "test.hxx"
-
-using namespace std;
-using namespace test;
-
-int
-main (int argc, char* argv[])
-{
- if (argc != 2)
- {
- cerr << "usage: " << argv[0] << " test.xml" << endl;
- return 1;
- }
-
- try
- {
- XSD_AUTO_PTR<type> r (root (argv[1], xml_schema::flags::dont_validate));
-
- xml_schema::namespace_infomap map;
- map["t"].name = "test";
- root (cout, *r, map);
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/tree/default/general/makefile b/tests/cxx/tree/default/general/makefile
deleted file mode 100644
index fc1bca1..0000000
--- a/tests/cxx/tree/default/general/makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# file : tests/cxx/tree/default/general/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o))
-dep := $(obj:.o=.o.d)
-
-driver := $(out_base)/driver
-test := $(out_base)/.test
-clean := $(out_base)/.clean
-
-
-# Import.
-#
-$(call import,\
- $(scf_root)/import/libxerces-c/stub.make,\
- l: xerces_c.l,cpp-options: xerces_c.l.cpp-options)
-
-
-# Build.
-#
-$(driver): $(obj) $(xerces_c.l)
-
-$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd
-$(obj) $(dep): $(xerces_c.l.cpp-options)
-
-genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
-gen := $(addprefix $(out_base)/,$(genf))
-
-$(gen): xsd := $(out_root)/xsd/xsd
-$(gen): xsd_options += --generate-ostream --generate-serialization \
---generate-default-ctor --generate-from-base-ctor
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-# Convenience alias for default target.
-#
-$(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))
-
-# Clean.
-#
-$(clean): $(driver).o.clean \
- $(addsuffix .cxx.clean,$(obj)) \
- $(addsuffix .cxx.clean,$(dep)) \
- $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(gen): | $(out_base)/.gitignore
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(bld_root)/cxx/o-e.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/cxx-d.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): xsd_options += --std $(cxx_standard)
-$(call include,$(scf_root)/xsd/tree/xsd-cxx.make)
-endif
-
-
-# Dependencies.
-#
-$(call import,$(src_root)/xsd/makefile)
diff --git a/tests/cxx/tree/default/general/output b/tests/cxx/tree/default/general/output
deleted file mode 100644
index 396a698..0000000
--- a/tests/cxx/tree/default/general/output
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<t:root xmlns:t="test" base64_bin1="" base64_bin2="YmFzZTY0IGJpbmFyeQ==&#xA;" bool1="true" bool2="true" bool3="false" bool4="false" byte="-99" decimal1="1.12345" decimal2="-0.456" double1="1.12345" double2="1123.45" double3="-0.00012345" double4="NaN" double5="-INF" fix1="123" fix2="123" fix3="abc" fix4="abc" fix5="aaa bbb ccc" fix6="aaa bbb ccc" float1="1.123" float2="1123" float3="-0.000123" float4="NaN" float5="-INF" hex_bin1="" hex_bin2="6865782052696E617279" id="this" idref="this" idrefs="this" int="-99999" integer="-99999" language="en-us" long="-99999" ncname="abcd" ninteger="-99999" nmtoken="ab:cd" nmtokens1="a:b efg aaa" nmtokens2="abc" nninteger="99999" npinteger="-99999" nstring=" a b " pinteger="99999" qname1="foo" qname2="t:bar" short="-999" string1="" string2=" a b " token="a b" ubyte="99" uint="99999" ulong="99999" uri="http://example.com" ushort="999">
- <union a="abc"/>
- <list a="123 345 678" b="ab cd ef" c="abc" d="abc def"/>
- <simple a="123" b="abc" c="123" d="abc" e="abc" f="abc 123"/>
- <date a="2009-03-31" b="2009-03-31Z" c="2009-03-31Z" d="2009-03-31Z" e="2009-03-31+12:30" f="2009-03-31-12:30" g="2002009-03-31-12:30"/>
- <time a="12:03:45" b="12:03:45.123Z" c="12:03:05.123Z" d="12:03:45.123Z" e="12:03:45.123+12:30" f="12:03:45-12:30"/>
- <date-time a="2009-03-31T12:03:45" b="2009-03-31T12:03:45.123Z" c="2002009-03-31T12:03:05.123-12:30"/>
- <duration a="P100Y" b="P100M" c="P100D" d="PT12H" e="PT12M" f="PT12.123S" g="-P100Y10M20DT12H12M1.123S"/>
- <day a="---02" b="---22Z" c="---22-12:30"/>
- <month a="--02" b="--12Z" c="--12+12:30"/>
- <year a="2009" b="-2002009Z" c="2009-12:30"/>
- <month-day a="--02-02" b="--12-22Z" c="--12-22+12:30"/>
- <year-month a="2009-02" b="-2002009-12Z" c="2009-12-12:30"/>
-</t:root>
diff --git a/tests/cxx/tree/default/general/test.xml b/tests/cxx/tree/default/general/test.xml
deleted file mode 100644
index 11bd0a7..0000000
--- a/tests/cxx/tree/default/general/test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<t:root xmlns:t="test" id="this" fix2="123" fix4="abc" fix6="aaa bbb ccc">
-
- <union/>
- <list/>
- <simple/>
- <date/>
- <time/>
- <date-time/>
- <duration/>
- <day/>
- <month/>
- <year/>
- <month-day/>
- <year-month/>
-
-</t:root>
diff --git a/tests/cxx/tree/default/general/test.xsd b/tests/cxx/tree/default/general/test.xsd
deleted file mode 100644
index 9d9cd38..0000000
--- a/tests/cxx/tree/default/general/test.xsd
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <!-- union -->
-
- <xs:simpleType name="union">
- <xs:union memberTypes="xs:int xs:string"/>
- </xs:simpleType>
-
- <xs:complexType name="union-test">
- <xs:attribute default="abc" name="a" type="t:union"/>
- </xs:complexType>
-
- <!-- list -->
-
- <xs:simpleType name="fix-list">
- <xs:list itemType="xs:int"/>
- </xs:simpleType>
-
- <xs:simpleType name="var-list">
- <xs:list itemType="xs:string"/>
- </xs:simpleType>
-
- <xs:simpleType name="list-item">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
- <xs:simpleType name="usr-list">
- <xs:list itemType="t:list-item"/>
- </xs:simpleType>
-
- <xs:simpleType name="union-list">
- <xs:list itemType="t:union"/>
- </xs:simpleType>
-
- <xs:complexType name="list-test">
- <xs:attribute default="123 345 678" name="a" type="t:fix-list"/>
- <xs:attribute default=" ab cd ef " name="b" type="t:var-list"/>
- <xs:attribute default="abc" name="c" type="t:usr-list"/>
- <xs:attribute default="abc def" name="d" type="t:union-list"/>
- </xs:complexType>
-
- <!-- simple type -->
-
- <xs:simpleType name="int-base">
- <xs:restriction base="xs:int"/>
- </xs:simpleType>
-
- <xs:simpleType name="str-base">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
- <xs:simpleType name="int">
- <xs:restriction base="t:int-base"/>
- </xs:simpleType>
-
- <xs:simpleType name="str">
- <xs:restriction base="t:str-base"/>
- </xs:simpleType>
-
- <xs:simpleType name="union-derived">
- <xs:restriction base="t:union"/>
- </xs:simpleType>
-
- <xs:simpleType name="list-derived">
- <xs:restriction base="t:usr-list"/>
- </xs:simpleType>
-
- <xs:complexType name="simple-test">
- <xs:attribute default="123" name="a" type="t:int-base"/>
- <xs:attribute default="abc" name="b" type="t:str-base"/>
- <xs:attribute default="123" name="c" type="t:int"/>
- <xs:attribute default="abc" name="d" type="t:str"/>
- <xs:attribute default="abc" name="e" type="t:union-derived"/>
- <xs:attribute default="abc 123" name="f" type="t:list-derived"/>
- </xs:complexType>
-
- <!-- date/time types -->
-
- <xs:simpleType name="date-derived">
- <xs:restriction base="xs:date"/>
- </xs:simpleType>
-
- <xs:complexType name="date-test">
- <xs:attribute default="2009-03-31" name="a" type="xs:date"/>
- <xs:attribute default="2009-03-31Z" name="b" type="xs:date"/>
- <xs:attribute default="2009-03-31+00:00" name="c" type="xs:date"/>
- <xs:attribute default="2009-03-31-00:00" name="d" type="xs:date"/>
- <xs:attribute default="2009-03-31+12:30" name="e" type="xs:date"/>
- <xs:attribute default="2009-03-31-12:30" name="f" type="xs:date"/>
- <xs:attribute default="2002009-03-31-12:30" name="g" type="t:date-derived"/>
- </xs:complexType>
-
- <xs:complexType name="time-test">
- <xs:attribute default="12:03:45" name="a" type="xs:time"/>
- <xs:attribute default="12:03:45.123Z" name="b" type="xs:time"/>
- <xs:attribute default="12:03:05.123+00:00" name="c" type="xs:time"/>
- <xs:attribute default="12:03:45.123-00:00" name="d" type="xs:time"/>
- <xs:attribute default="12:03:45.123+12:30" name="e" type="xs:time"/>
- <xs:attribute default="12:03:45-12:30" name="f" type="xs:time"/>
- </xs:complexType>
-
- <xs:complexType name="date-time-test">
- <xs:attribute default="2009-03-31T12:03:45" name="a" type="xs:dateTime"/>
- <xs:attribute default="2009-03-31T12:03:45.123Z" name="b" type="xs:dateTime"/>
- <xs:attribute default="2002009-03-31T12:03:05.123-12:30" name="c" type="xs:dateTime"/>
- </xs:complexType>
-
- <xs:complexType name="duration-test">
- <xs:attribute default="P100Y" name="a" type="xs:duration"/>
- <xs:attribute default="P100M" name="b" type="xs:duration"/>
- <xs:attribute default="P100D" name="c" type="xs:duration"/>
- <xs:attribute default="PT12H" name="d" type="xs:duration"/>
- <xs:attribute default="PT12M" name="e" type="xs:duration"/>
- <xs:attribute default="PT12.123S" name="f" type="xs:duration"/>
- <xs:attribute default="-P100Y10M20DT12H12M1.123S" name="g" type="xs:duration"/>
- </xs:complexType>
-
- <xs:complexType name="day-test">
- <xs:attribute default="---02" name="a" type="xs:gDay"/>
- <xs:attribute default="---22Z" name="b" type="xs:gDay"/>
- <xs:attribute default="---22-12:30" name="c" type="xs:gDay"/>
- </xs:complexType>
-
- <xs:complexType name="month-test">
- <xs:attribute default="--02" name="a" type="xs:gMonth"/>
- <xs:attribute default="--12Z" name="b" type="xs:gMonth"/>
- <xs:attribute default="--12+12:30" name="c" type="xs:gMonth"/>
- </xs:complexType>
-
- <xs:complexType name="year-test">
- <xs:attribute default="2009" name="a" type="xs:gYear"/>
- <xs:attribute default="-2002009Z" name="b" type="xs:gYear"/>
- <xs:attribute default="2009-12:30" name="c" type="xs:gYear"/>
- </xs:complexType>
-
- <xs:complexType name="month-day-test">
- <xs:attribute default="--02-02" name="a" type="xs:gMonthDay"/>
- <xs:attribute default="--12-22Z" name="b" type="xs:gMonthDay"/>
- <xs:attribute default="--12-22+12:30" name="c" type="xs:gMonthDay"/>
- </xs:complexType>
-
- <xs:complexType name="year-month-test">
- <xs:attribute default="2009-02" name="a" type="xs:gYearMonth"/>
- <xs:attribute default="-2002009-12Z" name="b" type="xs:gYearMonth"/>
- <xs:attribute default="2009-12-12:30" name="c" type="xs:gYearMonth"/>
- </xs:complexType>
-
-
- <xs:complexType name="type">
- <xs:sequence>
- <xs:element name="union" type="t:union-test"/>
- <xs:element name="list" type="t:list-test"/>
- <xs:element name="simple" type="t:simple-test"/>
- <xs:element name="date" type="t:date-test"/>
- <xs:element name="time" type="t:time-test"/>
- <xs:element name="date-time" type="t:date-time-test"/>
- <xs:element name="duration" type="t:duration-test"/>
- <xs:element name="day" type="t:day-test"/>
- <xs:element name="month" type="t:month-test"/>
- <xs:element name="year" type="t:year-test"/>
- <xs:element name="month-day" type="t:month-day-test"/>
- <xs:element name="year-month" type="t:year-month-test"/>
- </xs:sequence>
-
-<!--
- <xs:attribute name="any" type="xs:anySimpleType" default=""/>
--->
-
- <xs:attribute name="bool1" type="xs:boolean" default="true"/>
- <xs:attribute name="bool2" type="xs:boolean" default="1"/>
- <xs:attribute name="bool3" type="xs:boolean" default="false"/>
- <xs:attribute name="bool4" type="xs:boolean" default="0"/>
-
- <xs:attribute name="byte" type="xs:byte" default="-99"/>
- <xs:attribute name="ubyte" type="xs:unsignedByte" default="99"/>
- <xs:attribute name="short" type="xs:short" default="-999"/>
- <xs:attribute name="ushort" type="xs:unsignedShort" default="999"/>
- <xs:attribute name="int" type="xs:int" default="-99999"/>
- <xs:attribute name="uint" type="xs:unsignedInt" default="99999"/>
- <xs:attribute name="long" type="xs:long" default="-99999"/>
- <xs:attribute name="ulong" type="xs:unsignedLong" default="99999"/>
-
- <xs:attribute name="integer" type="xs:integer" default="-99999"/>
- <xs:attribute name="npinteger" type="xs:nonPositiveInteger" default="-99999"/>
- <xs:attribute name="nninteger" type="xs:nonNegativeInteger" default="99999"/>
- <xs:attribute name="pinteger" type="xs:positiveInteger" default="99999"/>
- <xs:attribute name="ninteger" type="xs:negativeInteger" default="-99999"/>
-
- <xs:attribute name="float1" type="xs:float" default="1.123"/>
- <xs:attribute name="float2" type="xs:float" default="1.123e3"/>
- <xs:attribute name="float3" type="xs:float" default="-.123E-3"/>
- <xs:attribute name="float4" type="xs:float" default="NaN"/>
- <xs:attribute name="float5" type="xs:float" default="-INF"/>
-
- <xs:attribute name="double1" type="xs:double" default="1.12345"/>
- <xs:attribute name="double2" type="xs:double" default="1.12345e3"/>
- <xs:attribute name="double3" type="xs:double" default="-.12345E-3"/>
- <xs:attribute name="double4" type="xs:double" default="NaN"/>
- <xs:attribute name="double5" type="xs:double" default="-INF"/>
-
- <xs:attribute name="decimal1" type="xs:decimal" default="1.12345"/>
- <xs:attribute name="decimal2" type="xs:decimal" default="-.456"/>
-
- <xs:attribute name="string1" type="xs:string" default=""/>
- <xs:attribute name="string2" type="xs:string" default=" a b "/>
- <xs:attribute name="nstring" type="xs:normalizedString" default=" a b "/>
- <xs:attribute name="token" type="xs:token" default=" a b "/>
- <xs:attribute name="nmtoken" type="xs:NMTOKEN" default="ab:cd"/>
- <xs:attribute name="nmtokens1" type="xs:NMTOKENS" default=" a:b efg aaa "/>
- <xs:attribute name="nmtokens2" type="xs:NMTOKENS" default="abc"/>
- <xs:attribute name="ncname" type="xs:NCName" default=" abcd "/>
- <xs:attribute name="language" type="xs:language" default=" en-us "/>
- <xs:attribute name="id" type="xs:ID"/>
- <xs:attribute name="idref" type="xs:IDREF" default="this"/>
- <xs:attribute name="idrefs" type="xs:IDREFS" default=" this "/>
- <xs:attribute name="uri" type="xs:anyURI" default=" http://example.com "/>
-
- <xs:attribute name="qname1" type="xs:QName" default="foo"/>
- <xs:attribute name="qname2" type="xs:QName" default="t:bar"/>
-
- <xs:attribute name="base64_bin1" type="xs:base64Binary" default=""/>
- <xs:attribute name="base64_bin2" type="xs:base64Binary" default="YmFzZTY0IGJpbmFyeQ=="/>
-
- <xs:attribute name="hex_bin1" type="xs:hexBinary" default=""/>
- <xs:attribute name="hex_bin2" type="xs:hexBinary" default="6865782052696E617279"/>
-
- <!-- fixed -->
-
- <xs:attribute name="fix1" type="xs:int" fixed="123"/>
- <xs:attribute name="fix2" type="xs:int" fixed="123" use="required"/>
- <xs:attribute name="fix3" type="xs:string" fixed="abc"/>
- <xs:attribute name="fix4" type="xs:string" fixed="abc" use="required"/>
- <xs:attribute name="fix5" type="xs:NMTOKENS" fixed="aaa bbb ccc"/>
- <xs:attribute name="fix6" type="xs:NMTOKENS" fixed="aaa bbb ccc" use="required"/>
-
- </xs:complexType>
-
- <xs:element name="root" type="t:type"/>
-
-</xs:schema>
diff --git a/tests/cxx/tree/default/makefile b/tests/cxx/tree/default/makefile
deleted file mode 100644
index 304640e..0000000
--- a/tests/cxx/tree/default/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# file : tests/cxx/tree/default/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-tests := general omit
-
-default := $(out_base)/
-test := $(out_base)/.test
-clean := $(out_base)/.clean
-
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests)))
-$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests)))
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests)))
-
-$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile))
diff --git a/tests/cxx/tree/default/omit/driver.cxx b/tests/cxx/tree/default/omit/driver.cxx
deleted file mode 100644
index e588a34..0000000
--- a/tests/cxx/tree/default/omit/driver.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-// file : tests/cxx/tree/default/omit/driver.cxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test default attribute omission from the output.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <iostream>
-
-#include "test.hxx"
-
-using namespace std;
-using namespace test;
-
-int
-main (int argc, char* argv[])
-{
- if (argc != 2)
- {
- cerr << "usage: " << argv[0] << " test.xml" << endl;
- return 1;
- }
-
- try
- {
- XSD_AUTO_PTR<type> r (root (argv[1], xml_schema::flags::dont_validate));
-
- cout << *r << endl
- << "default x: " << derived::x_default_value () << endl
- << "default y: " << derived::y_default_value () << endl
- << "fixed p: " << derived::p_default_value () << endl
- << "fixed q1: " << derived::q1_default_value () << endl
- << "fixed q2: " << derived::q2_default_value () << endl;
-
- // Serialize.
- //
- xml_schema::namespace_infomap map;
- map["t"].name = "test";
- root (cout, *r, map);
- }
- catch (xml_schema::exception const& e)
- {
- cerr << e << endl;
- return 1;
- }
-}
diff --git a/tests/cxx/tree/default/omit/makefile b/tests/cxx/tree/default/omit/makefile
deleted file mode 100644
index 93a9cd2..0000000
--- a/tests/cxx/tree/default/omit/makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# file : tests/cxx/tree/default/omit/makefile
-# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make
-
-xsd := test.xsd
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o))
-dep := $(obj:.o=.o.d)
-
-driver := $(out_base)/driver
-test := $(out_base)/.test
-clean := $(out_base)/.clean
-
-
-# Import.
-#
-$(call import,\
- $(scf_root)/import/libxerces-c/stub.make,\
- l: xerces_c.l,cpp-options: xerces_c.l.cpp-options)
-
-
-# Build.
-#
-$(driver): $(obj) $(xerces_c.l)
-
-$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd
-$(obj) $(dep): $(xerces_c.l.cpp-options)
-
-genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx)
-gen := $(addprefix $(out_base)/,$(genf))
-
-$(gen): xsd := $(out_root)/xsd/xsd
-$(gen): xsd_options += --generate-ostream --generate-serialization \
---generate-default-ctor --generate-from-base-ctor --omit-default-attributes
-$(gen): $(out_root)/xsd/xsd
-
-$(call include-dep,$(dep),$(obj),$(gen))
-
-# Convenience alias for default target.
-#
-$(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))
-
-# Clean.
-#
-$(clean): $(driver).o.clean \
- $(addsuffix .cxx.clean,$(obj)) \
- $(addsuffix .cxx.clean,$(dep)) \
- $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean))
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(gen): | $(out_base)/.gitignore
-$(driver): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := driver $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(bld_root)/cxx/o-e.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/cxx-d.make)
-
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifdef cxx_standard
-$(gen): xsd_options += --std $(cxx_standard)
-$(call include,$(scf_root)/xsd/tree/xsd-cxx.make)
-endif
-
-
-# Dependencies.
-#
-$(call import,$(src_root)/xsd/makefile)
diff --git a/tests/cxx/tree/default/omit/output b/tests/cxx/tree/default/omit/output
deleted file mode 100644
index 150ad58..0000000
--- a/tests/cxx/tree/default/omit/output
+++ /dev/null
@@ -1,19 +0,0 @@
-
-derived:
-a: a
-x: foo
-q1: 1
-y: -20
-p: bar
-q2: 2
-default x: foo
-default y: -20
-fixed p: bar
-fixed q1: 1
-fixed q2: 2
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<t:root xmlns:t="test">
- <derived q1="1" q2="2">
- <a>a</a>
- </derived>
-</t:root>
diff --git a/tests/cxx/tree/default/omit/test.xml b/tests/cxx/tree/default/omit/test.xml
deleted file mode 100644
index dec39b4..0000000
--- a/tests/cxx/tree/default/omit/test.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<t:root xmlns:t="test"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="test test.xsd">
-
- <derived q1="1" q2="2">
- <a>a</a>
- </derived>
-
-</t:root>
diff --git a/tests/cxx/tree/default/omit/test.xsd b/tests/cxx/tree/default/omit/test.xsd
deleted file mode 100644
index bfc68d4..0000000
--- a/tests/cxx/tree/default/omit/test.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
- <complexType name="base">
- <sequence>
- <element name="a" type="string"/>
- </sequence>
- <attribute name="x" type="string" default="foo"/>
- <attribute name="q1" type="int" fixed="1" use="required"/>
- </complexType>
-
- <complexType name="derived">
- <complexContent>
- <extension base="t:base">
- <attribute name="y" type="int" default="-20"/>
- <attribute name="p" type="string" fixed="bar"/>
- <attribute name="q2" type="int" fixed="2" use="required"/>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="type">
- <sequence>
- <element name="derived" type="t:derived"/>
- </sequence>
- </complexType>
-
- <element name="root" type="t:type"/>
-
-</schema>