From a8ce5c380c69539fe0c7c62c397634d9d0c9fde2 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/polymorphism/comparison/driver.cxx | 85 ---------------------- tests/cxx/tree/polymorphism/comparison/makefile | 86 ---------------------- tests/cxx/tree/polymorphism/comparison/test.xml | 7 -- tests/cxx/tree/polymorphism/comparison/test.xsd | 39 ---------- tests/cxx/tree/polymorphism/makefile | 16 ----- tests/cxx/tree/polymorphism/ostream/driver.cxx | 34 --------- tests/cxx/tree/polymorphism/ostream/makefile | 87 ----------------------- tests/cxx/tree/polymorphism/ostream/output | 18 ----- tests/cxx/tree/polymorphism/ostream/test.xml | 10 --- tests/cxx/tree/polymorphism/ostream/test.xsd | 62 ---------------- tests/cxx/tree/polymorphism/same-type/driver.cxx | 35 --------- tests/cxx/tree/polymorphism/same-type/makefile | 86 ---------------------- tests/cxx/tree/polymorphism/same-type/output | 9 --- tests/cxx/tree/polymorphism/same-type/test.xml | 10 --- tests/cxx/tree/polymorphism/same-type/test.xsd | 21 ------ 15 files changed, 605 deletions(-) delete mode 100644 tests/cxx/tree/polymorphism/comparison/driver.cxx delete mode 100644 tests/cxx/tree/polymorphism/comparison/makefile delete mode 100644 tests/cxx/tree/polymorphism/comparison/test.xml delete mode 100644 tests/cxx/tree/polymorphism/comparison/test.xsd delete mode 100644 tests/cxx/tree/polymorphism/makefile delete mode 100644 tests/cxx/tree/polymorphism/ostream/driver.cxx delete mode 100644 tests/cxx/tree/polymorphism/ostream/makefile delete mode 100644 tests/cxx/tree/polymorphism/ostream/output delete mode 100644 tests/cxx/tree/polymorphism/ostream/test.xml delete mode 100644 tests/cxx/tree/polymorphism/ostream/test.xsd delete mode 100644 tests/cxx/tree/polymorphism/same-type/driver.cxx delete mode 100644 tests/cxx/tree/polymorphism/same-type/makefile delete mode 100644 tests/cxx/tree/polymorphism/same-type/output delete mode 100644 tests/cxx/tree/polymorphism/same-type/test.xml delete mode 100644 tests/cxx/tree/polymorphism/same-type/test.xsd (limited to 'tests/cxx/tree/polymorphism') diff --git a/tests/cxx/tree/polymorphism/comparison/driver.cxx b/tests/cxx/tree/polymorphism/comparison/driver.cxx deleted file mode 100644 index 8685a2e..0000000 --- a/tests/cxx/tree/polymorphism/comparison/driver.cxx +++ /dev/null @@ -1,85 +0,0 @@ -// file : tests/cxx/tree/polymorphism/comparison/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test comparison of polymorphic object models. -// - -#include // std::auto_ptr/unique_ptr -#include -#include - -#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 r (root (argv[1])); - - // Equals. - // - { - derived1 d ("a", 1); - d.b ("b"); - type r1 (d); - - assert (*r == r1); - } - - // Values are not equal. - // - { - derived1 d ("a", 1); - d.b ("c"); - type r1 (d); - - assert (*r != r1); - } - - // Values are not equal. - // - { - derived1 d ("a", 2); - d.b ("b"); - type r1 (d); - - assert (*r != r1); - } - - // Different types. - // - { - derived2 d ("a", 1); - d.c ().push_back ("c"); - type r1 (d); - - assert (*r != r1); - } - - xml_schema::namespace_infomap map; - - map["t"].name = "test"; - - stringstream s; - root (s, *r, map); - - XSD_AUTO_PTR c (root (s, xml_schema::flags::dont_validate)); - - assert (*r == *c); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/polymorphism/comparison/makefile b/tests/cxx/tree/polymorphism/comparison/makefile deleted file mode 100644 index 15e6d02..0000000 --- a/tests/cxx/tree/polymorphism/comparison/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/polymorphism/comparison/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-polymorphic --polymorphic-type base \ ---generate-comparison --generate-serialization -$(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 - $(call message,test $$1,$$1 $(src_base)/test.xml,$(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/polymorphism/comparison/test.xml b/tests/cxx/tree/polymorphism/comparison/test.xml deleted file mode 100644 index 0b8c125..0000000 --- a/tests/cxx/tree/polymorphism/comparison/test.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - a1b - - diff --git a/tests/cxx/tree/polymorphism/comparison/test.xsd b/tests/cxx/tree/polymorphism/comparison/test.xsd deleted file mode 100644 index 364d1b3..0000000 --- a/tests/cxx/tree/polymorphism/comparison/test.xsd +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/polymorphism/makefile b/tests/cxx/tree/polymorphism/makefile deleted file mode 100644 index 93a3ad2..0000000 --- a/tests/cxx/tree/polymorphism/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/polymorphism/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := comparison ostream same-type - -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/polymorphism/ostream/driver.cxx b/tests/cxx/tree/polymorphism/ostream/driver.cxx deleted file mode 100644 index 7da2030..0000000 --- a/tests/cxx/tree/polymorphism/ostream/driver.cxx +++ /dev/null @@ -1,34 +0,0 @@ -// file : tests/cxx/tree/polymorphism/ostream/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test printing of polymorphic object models. -// - -#include // std::auto_ptr/unique_ptr -#include - -#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 r (root (argv[1])); - cout << *r << endl; - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/polymorphism/ostream/makefile b/tests/cxx/tree/polymorphism/ostream/makefile deleted file mode 100644 index 65c37b1..0000000 --- a/tests/cxx/tree/polymorphism/ostream/makefile +++ /dev/null @@ -1,87 +0,0 @@ -# file : tests/cxx/tree/polymorphism/ostream/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-polymorphic --polymorphic-type-all \ ---root-element root --generate-ostream -$(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/polymorphism/ostream/output b/tests/cxx/tree/polymorphism/ostream/output deleted file mode 100644 index e7fbd68..0000000 --- a/tests/cxx/tree/polymorphism/ostream/output +++ /dev/null @@ -1,18 +0,0 @@ - -base: -a: a -fund: 1 -base: -a: a -fund: 1 -b: b -base: -a: a -fund: 1 -c: c1 -c: c2 -base: -a: a -fund: 1 -d: d1 -d: d2 diff --git a/tests/cxx/tree/polymorphism/ostream/test.xml b/tests/cxx/tree/polymorphism/ostream/test.xml deleted file mode 100644 index 5409d2a..0000000 --- a/tests/cxx/tree/polymorphism/ostream/test.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - a1 - a1b - a1c1c2 - a1d1d2 - - diff --git a/tests/cxx/tree/polymorphism/ostream/test.xsd b/tests/cxx/tree/polymorphism/ostream/test.xsd deleted file mode 100644 index 688cd5a..0000000 --- a/tests/cxx/tree/polymorphism/ostream/test.xsd +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/polymorphism/same-type/driver.cxx b/tests/cxx/tree/polymorphism/same-type/driver.cxx deleted file mode 100644 index 883ba64..0000000 --- a/tests/cxx/tree/polymorphism/same-type/driver.cxx +++ /dev/null @@ -1,35 +0,0 @@ -// file : tests/cxx/tree/polymorphism/same-type/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test substitution group and xsi:type that don't change the type. -// - -#include // std::auto_ptr/unique_ptr -#include - -#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 r (root (argv[1])); - - cout << *r << endl; - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } -} diff --git a/tests/cxx/tree/polymorphism/same-type/makefile b/tests/cxx/tree/polymorphism/same-type/makefile deleted file mode 100644 index 3185804..0000000 --- a/tests/cxx/tree/polymorphism/same-type/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/polymorphism/same-type/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-polymorphic \ ---root-element root -$(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/polymorphism/same-type/output b/tests/cxx/tree/polymorphism/same-type/output deleted file mode 100644 index 04b5cbf..0000000 --- a/tests/cxx/tree/polymorphism/same-type/output +++ /dev/null @@ -1,9 +0,0 @@ - -base: -a: a1 -base: -a: a2 -base: -a: a3 -base: -a: a4 diff --git a/tests/cxx/tree/polymorphism/same-type/test.xml b/tests/cxx/tree/polymorphism/same-type/test.xml deleted file mode 100644 index f8b6d1e..0000000 --- a/tests/cxx/tree/polymorphism/same-type/test.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - a1 - a2 - a3 - a4 - - diff --git a/tests/cxx/tree/polymorphism/same-type/test.xsd b/tests/cxx/tree/polymorphism/same-type/test.xsd deleted file mode 100644 index a4157d3..0000000 --- a/tests/cxx/tree/polymorphism/same-type/test.xsd +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -- cgit v1.1