From 5e527213a2430bb3018e5eebd909aef294edf9b5 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 18 Dec 2020 18:48:46 +0300 Subject: Switch to build2 --- tests/cxx/tree/naming/camel/driver.cxx | 154 --------------------------------- tests/cxx/tree/naming/camel/makefile | 93 -------------------- tests/cxx/tree/naming/camel/test.xsd | 31 ------- tests/cxx/tree/naming/java/driver.cxx | 153 -------------------------------- tests/cxx/tree/naming/java/makefile | 93 -------------------- tests/cxx/tree/naming/java/test.xsd | 31 ------- tests/cxx/tree/naming/knr/driver.cxx | 154 --------------------------------- tests/cxx/tree/naming/knr/makefile | 93 -------------------- tests/cxx/tree/naming/knr/test.xsd | 31 ------- tests/cxx/tree/naming/makefile | 16 ---- 10 files changed, 849 deletions(-) delete mode 100644 tests/cxx/tree/naming/camel/driver.cxx delete mode 100644 tests/cxx/tree/naming/camel/makefile delete mode 100644 tests/cxx/tree/naming/camel/test.xsd delete mode 100644 tests/cxx/tree/naming/java/driver.cxx delete mode 100644 tests/cxx/tree/naming/java/makefile delete mode 100644 tests/cxx/tree/naming/java/test.xsd delete mode 100644 tests/cxx/tree/naming/knr/driver.cxx delete mode 100644 tests/cxx/tree/naming/knr/makefile delete mode 100644 tests/cxx/tree/naming/knr/test.xsd delete mode 100644 tests/cxx/tree/naming/makefile (limited to 'tests/cxx/tree/naming') diff --git a/tests/cxx/tree/naming/camel/driver.cxx b/tests/cxx/tree/naming/camel/driver.cxx deleted file mode 100644 index e9d7180..0000000 --- a/tests/cxx/tree/naming/camel/driver.cxx +++ /dev/null @@ -1,154 +0,0 @@ -// file : tests/cxx/tree/naming/camel/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test camel case (upper for types, lower for functions) naming style. -// - -#include -#include - -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -int -main () -{ - xercesc::XMLPlatformUtils::Initialize (); - - try - { - // Enum 'value' type. - // - { - Gender::Value v; - v = Gender::female; - XSD_UNUSED (v); - } - - // Anonymous type. - // - { - Foo f ("a", "b"); - - if (f.a () != "a" || f.b () != "b") - return 1; - } - - // Type name and accessors/modifiers. - // - { - Type t ("bar"); - - // foo - // - { - Type::FooType* p = 0; - XSD_UNUSED (p); - - Type::FooOptional o; - - if (t.foo ().present ()) - return 1; - - t.foo (o); - } - - // bar - // - { - Type::BarType* p = 0; - XSD_UNUSED (p); - - if (t.bar () != "bar") - return 1; - - t.bar ("barbar"); - } - - // baz - // - { - Type::BazType* p = 0; - XSD_UNUSED (p); - - Type::BazSequence s; - Type::BazIterator i (s.begin ()); - Type::BazConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.baz () != s) - return 1; - - t.baz (s); - } - - // any - // - { - Type::AnySequence s (t.domDocument ()); - Type::AnyIterator i (s.begin ()); - Type::AnyConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.any () != s) - return 1; - - t.any (s); - } - - // foo - // - { - Type::FoxType x = Type::foxDefaultValue (); - - if (t.fox () != x) - return 1; - - t.fox ("fox"); - } - - // any_attribute - // - { - Type::AnyAttributeSet s (t.domDocument ()); - Type::AnyAttributeIterator i (s.begin ()); - Type::AnyAttributeConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.anyAttribute () != s) - return 1; - - t.anyAttribute (s); - } - } - - // Parsing/serialization functions. - // - { - istringstream is ("foo"); - root (is, xml_schema::Flags::dont_validate); - } - - { - ostringstream os; - xml_schema::NamespaceInfomap m; - m["t"].name = "test"; - - root (os, "foo", m); - } - } - catch (xml_schema::Exception const& e) - { - cerr << e << endl; - return 1; - } - - xercesc::XMLPlatformUtils::Terminate (); -} diff --git a/tests/cxx/tree/naming/camel/makefile b/tests/cxx/tree/naming/camel/makefile deleted file mode 100644 index 3fc0dcc..0000000 --- a/tests/cxx/tree/naming/camel/makefile +++ /dev/null @@ -1,93 +0,0 @@ -# file : tests/cxx/tree/naming/camel/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 += \ ---type-naming ucc \ ---function-naming lcc \ ---generate-ostream \ ---generate-serialization \ ---generate-comparison \ ---generate-wildcard - -$(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) - $(call message,test $$1,$$1,$(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/naming/camel/test.xsd b/tests/cxx/tree/naming/camel/test.xsd deleted file mode 100644 index 7d0a745..0000000 --- a/tests/cxx/tree/naming/camel/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/naming/java/driver.cxx b/tests/cxx/tree/naming/java/driver.cxx deleted file mode 100644 index b96917b..0000000 --- a/tests/cxx/tree/naming/java/driver.cxx +++ /dev/null @@ -1,153 +0,0 @@ -// file : tests/cxx/tree/naming/java/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test Java naming style. -// - -#include -#include - -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -int -main () -{ - xercesc::XMLPlatformUtils::Initialize (); - - try - { - // Enum 'value' type. - // - { - Gender::Value v; - v = Gender::female; - XSD_UNUSED (v); - } - - // Anonymous type. - // - { - Foo f ("a", "b"); - - if (f.getA () != "a" || f.getB () != "b") - return 1; - } - - // Type name and accessors/modifiers. - // - { - Type t ("bar"); - - // foo - // - { - Type::FooType* p = 0; - XSD_UNUSED (p); - Type::FooOptional o; - - if (t.getFoo ().present ()) - return 1; - - t.setFoo (o); - } - - // bar - // - { - Type::BarType* p = 0; - XSD_UNUSED (p); - - if (t.getBar () != "bar") - return 1; - - t.setBar ("barbar"); - } - - // baz - // - { - Type::BazType* p = 0; - XSD_UNUSED (p); - - Type::BazSequence s; - Type::BazIterator i (s.begin ()); - Type::BazConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.getBaz () != s) - return 1; - - t.setBaz (s); - } - - // any - // - { - Type::AnySequence s (t.getDomDocument ()); - Type::AnyIterator i (s.begin ()); - Type::AnyConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.getAny () != s) - return 1; - - t.setAny (s); - } - - // foo - // - { - Type::FoxType x = Type::getFoxDefaultValue (); - - if (t.getFox () != x) - return 1; - - t.setFox ("fox"); - } - - // any_attribute - // - { - Type::AnyAttributeSet s (t.getDomDocument ()); - Type::AnyAttributeIterator i (s.begin ()); - Type::AnyAttributeConstIterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.getAnyAttribute () != s) - return 1; - - t.setAnyAttribute (s); - } - } - - // Parsing/serialization functions. - // - { - istringstream is ("foo"); - parseRoot (is, xml_schema::Flags::dont_validate); - } - - { - ostringstream os; - xml_schema::NamespaceInfomap m; - m["t"].name = "test"; - - serializeRoot (os, "foo", m); - } - } - catch (xml_schema::Exception const& e) - { - cerr << e << endl; - return 1; - } - - xercesc::XMLPlatformUtils::Terminate (); -} diff --git a/tests/cxx/tree/naming/java/makefile b/tests/cxx/tree/naming/java/makefile deleted file mode 100644 index 713126d..0000000 --- a/tests/cxx/tree/naming/java/makefile +++ /dev/null @@ -1,93 +0,0 @@ -# file : tests/cxx/tree/naming/java/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 += \ ---type-naming java \ ---function-naming java \ ---generate-ostream \ ---generate-serialization \ ---generate-comparison \ ---generate-wildcard - -$(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) - $(call message,test $$1,$$1,$(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/naming/java/test.xsd b/tests/cxx/tree/naming/java/test.xsd deleted file mode 100644 index f525534..0000000 --- a/tests/cxx/tree/naming/java/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/naming/knr/driver.cxx b/tests/cxx/tree/naming/knr/driver.cxx deleted file mode 100644 index 28e6562..0000000 --- a/tests/cxx/tree/naming/knr/driver.cxx +++ /dev/null @@ -1,154 +0,0 @@ -// file : tests/cxx/tree/naming/knr/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test K&R naming style. -// - -#include -#include - -#include - -#include "test.hxx" - -using namespace std; -using namespace test; - -int -main () -{ - xercesc::XMLPlatformUtils::Initialize (); - - try - { - // Enum 'value' type. - // - { - gender::value v; - v = gender::female; - XSD_UNUSED (v); - } - - // Anonymous type. - // - { - foo f ("a", "b"); - - if (f.a () != "a" || f.b () != "b") - return 1; - } - - // Type name and accessors/modifiers. - // - { - type t ("bar"); - - // foo - // - { - type::foo_type* p = 0; - XSD_UNUSED (p); - - type::foo_optional o; - - if (t.foo ().present ()) - return 1; - - t.foo (o); - } - - // bar - // - { - type::bar_type* p = 0; - XSD_UNUSED (p); - - if (t.bar () != "bar") - return 1; - - t.bar ("barbar"); - } - - // baz - // - { - type::baz_type* p = 0; - XSD_UNUSED (p); - - type::baz_sequence s; - type::baz_iterator i (s.begin ()); - type::baz_const_iterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.baz () != s) - return 1; - - t.baz (s); - } - - // any - // - { - type::any_sequence s (t.dom_document ()); - type::any_iterator i (s.begin ()); - type::any_const_iterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.any () != s) - return 1; - - t.any (s); - } - - // foo - // - { - type::fox_type x = type::fox_default_value (); - - if (t.fox () != x) - return 1; - - t.fox ("fox"); - } - - // any_attribute - // - { - type::any_attribute_set s (t.dom_document ()); - type::any_attribute_iterator i (s.begin ()); - type::any_attribute_const_iterator ci (s.begin ()); - XSD_UNUSED (i); - XSD_UNUSED (ci); - - if (t.any_attribute () != s) - return 1; - - t.any_attribute (s); - } - } - - // Parsing/serialization functions. - // - { - istringstream is ("foo"); - root (is, xml_schema::flags::dont_validate); - } - - { - ostringstream os; - xml_schema::namespace_infomap m; - m["t"].name = "test"; - - root (os, "foo", m); - } - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - - xercesc::XMLPlatformUtils::Terminate (); -} diff --git a/tests/cxx/tree/naming/knr/makefile b/tests/cxx/tree/naming/knr/makefile deleted file mode 100644 index 364a491..0000000 --- a/tests/cxx/tree/naming/knr/makefile +++ /dev/null @@ -1,93 +0,0 @@ -# file : tests/cxx/tree/naming/knr/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 += \ ---type-naming knr \ ---function-naming knr \ ---generate-ostream \ ---generate-serialization \ ---generate-comparison \ ---generate-wildcard - -$(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) - $(call message,test $$1,$$1,$(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/naming/knr/test.xsd b/tests/cxx/tree/naming/knr/test.xsd deleted file mode 100644 index 4361544..0000000 --- a/tests/cxx/tree/naming/knr/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/naming/makefile b/tests/cxx/tree/naming/makefile deleted file mode 100644 index 3c974ef..0000000 --- a/tests/cxx/tree/naming/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/naming/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := camel java knr - -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)) -- cgit v1.1