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/default/general/driver.cxx | 37 ----- tests/cxx/tree/default/general/makefile | 86 ----------- tests/cxx/tree/default/general/output | 15 -- tests/cxx/tree/default/general/test.xml | 16 -- tests/cxx/tree/default/general/test.xsd | 241 ------------------------------ tests/cxx/tree/default/makefile | 16 -- tests/cxx/tree/default/omit/driver.cxx | 46 ------ tests/cxx/tree/default/omit/makefile | 86 ----------- tests/cxx/tree/default/omit/output | 19 --- tests/cxx/tree/default/omit/test.xml | 9 -- tests/cxx/tree/default/omit/test.xsd | 30 ---- 11 files changed, 601 deletions(-) delete mode 100644 tests/cxx/tree/default/general/driver.cxx delete mode 100644 tests/cxx/tree/default/general/makefile delete mode 100644 tests/cxx/tree/default/general/output delete mode 100644 tests/cxx/tree/default/general/test.xml delete mode 100644 tests/cxx/tree/default/general/test.xsd delete mode 100644 tests/cxx/tree/default/makefile delete mode 100644 tests/cxx/tree/default/omit/driver.cxx delete mode 100644 tests/cxx/tree/default/omit/makefile delete mode 100644 tests/cxx/tree/default/omit/output delete mode 100644 tests/cxx/tree/default/omit/test.xml delete mode 100644 tests/cxx/tree/default/omit/test.xsd (limited to 'tests/cxx/tree/default') 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 // 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], 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 @@ - - - - - - - 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 @@ - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 // 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], 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 - - - - a - - 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 @@ - - - - a - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.1