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/encoding/char/iso-8859-1/driver.cxx | 74 ------------------- tests/cxx/tree/encoding/char/iso-8859-1/makefile | 86 ---------------------- tests/cxx/tree/encoding/char/iso-8859-1/test.std | 10 --- tests/cxx/tree/encoding/char/iso-8859-1/test.xml | 14 ---- tests/cxx/tree/encoding/char/iso-8859-1/test.xsd | 31 -------- tests/cxx/tree/encoding/char/lcp/driver.cxx | 40 ---------- tests/cxx/tree/encoding/char/lcp/makefile | 85 --------------------- tests/cxx/tree/encoding/char/lcp/test.std | 4 - tests/cxx/tree/encoding/char/lcp/test.xml | 7 -- tests/cxx/tree/encoding/char/lcp/test.xsd | 12 --- tests/cxx/tree/encoding/char/makefile | 16 ---- tests/cxx/tree/encoding/char/utf-8/driver.cxx | 63 ---------------- tests/cxx/tree/encoding/char/utf-8/makefile | 85 --------------------- tests/cxx/tree/encoding/char/utf-8/test.std | 9 --- tests/cxx/tree/encoding/char/utf-8/test.xml | 13 ---- tests/cxx/tree/encoding/char/utf-8/test.xsd | 31 -------- tests/cxx/tree/encoding/makefile | 16 ---- tests/cxx/tree/encoding/wchar/driver.cxx | 55 -------------- tests/cxx/tree/encoding/wchar/makefile | 86 ---------------------- tests/cxx/tree/encoding/wchar/test.std | 10 --- tests/cxx/tree/encoding/wchar/test.xml | 14 ---- tests/cxx/tree/encoding/wchar/test.xsd | 33 --------- 22 files changed, 794 deletions(-) delete mode 100644 tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx delete mode 100644 tests/cxx/tree/encoding/char/iso-8859-1/makefile delete mode 100644 tests/cxx/tree/encoding/char/iso-8859-1/test.std delete mode 100644 tests/cxx/tree/encoding/char/iso-8859-1/test.xml delete mode 100644 tests/cxx/tree/encoding/char/iso-8859-1/test.xsd delete mode 100644 tests/cxx/tree/encoding/char/lcp/driver.cxx delete mode 100644 tests/cxx/tree/encoding/char/lcp/makefile delete mode 100644 tests/cxx/tree/encoding/char/lcp/test.std delete mode 100644 tests/cxx/tree/encoding/char/lcp/test.xml delete mode 100644 tests/cxx/tree/encoding/char/lcp/test.xsd delete mode 100644 tests/cxx/tree/encoding/char/makefile delete mode 100644 tests/cxx/tree/encoding/char/utf-8/driver.cxx delete mode 100644 tests/cxx/tree/encoding/char/utf-8/makefile delete mode 100644 tests/cxx/tree/encoding/char/utf-8/test.std delete mode 100644 tests/cxx/tree/encoding/char/utf-8/test.xml delete mode 100644 tests/cxx/tree/encoding/char/utf-8/test.xsd delete mode 100644 tests/cxx/tree/encoding/makefile delete mode 100644 tests/cxx/tree/encoding/wchar/driver.cxx delete mode 100644 tests/cxx/tree/encoding/wchar/makefile delete mode 100644 tests/cxx/tree/encoding/wchar/test.std delete mode 100644 tests/cxx/tree/encoding/wchar/test.xml delete mode 100644 tests/cxx/tree/encoding/wchar/test.xsd (limited to 'tests/cxx/tree/encoding') diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx b/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx deleted file mode 100644 index 2840e0a..0000000 --- a/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx +++ /dev/null @@ -1,74 +0,0 @@ -// file : tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test ISO-8859-1 encoding. -// - -#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 - { - try - { - root (argv[1]); - return 1; - } - catch (xsd::cxx::xml::iso8859_1_unrepresentable const&) - { - } - - xsd::cxx::xml::char_transcoder::unrep_char ('?'); - XSD_AUTO_PTR r (root (argv[1])); - - { - type::a_sequence const& s (r->a ()); - - if (s[0] != "abc" || - s[1] != "\xE6" || - s[2] != "\xA2\xA3\xA4\xA5" || - s[3] != "??") - { - cerr << "invalid encoding" << endl; - return 1; - } - } - - { - type::b_sequence const& s (r->b ()); - - if (s[0] != strenum::abc || - s[1] != strenum::a_c || - s[2] != strenum::cxx__bc) - { - cerr << "invalid encoding" << endl; - return 1; - } - } - - xml_schema::namespace_infomap map; - map["t"].name = "test"; - - root (std::cout, *r, map, "ISO-8859-1"); - } - catch (xml_schema::exception const& e) - { - cerr << "xml_schema::exception: " << e.what () << endl; - return 1; - } -} diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/makefile b/tests/cxx/tree/encoding/char/iso-8859-1/makefile deleted file mode 100644 index 8b28e4e..0000000 --- a/tests/cxx/tree/encoding/char/iso-8859-1/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/encoding/char/iso-8859-1/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 += --char-encoding iso8859-1 --generate-serialization \ ---generate-doxygen -$(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)/test.std - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/test.std -,$(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/encoding/char/iso-8859-1/test.std b/tests/cxx/tree/encoding/char/iso-8859-1/test.std deleted file mode 100644 index cb73faa..0000000 --- a/tests/cxx/tree/encoding/char/iso-8859-1/test.std +++ /dev/null @@ -1,10 +0,0 @@ - - - abc - æ - ¢£¤¥ - ?? - abc - aâc - âòbc - diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/test.xml b/tests/cxx/tree/encoding/char/iso-8859-1/test.xml deleted file mode 100644 index cc05f8d..0000000 --- a/tests/cxx/tree/encoding/char/iso-8859-1/test.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - abc - æ - ¢£¤¥ - Āꪪ - - abc - aâc - âòbc - - diff --git a/tests/cxx/tree/encoding/char/iso-8859-1/test.xsd b/tests/cxx/tree/encoding/char/iso-8859-1/test.xsd deleted file mode 100644 index 31b8901..0000000 --- a/tests/cxx/tree/encoding/char/iso-8859-1/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - Test enum. Valid values are: - abc - aâc - òbc - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/encoding/char/lcp/driver.cxx b/tests/cxx/tree/encoding/char/lcp/driver.cxx deleted file mode 100644 index 4e2933d..0000000 --- a/tests/cxx/tree/encoding/char/lcp/driver.cxx +++ /dev/null @@ -1,40 +0,0 @@ -// file : tests/cxx/tree/encoding/char/lcp/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test local code page encoding (--char-encoding lcp). -// The test just makes sure it still compiles and works. -// - -#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])); - - xml_schema::namespace_infomap map; - map["t"].name = "test"; - - root (std::cout, *r, map); - } - catch (xml_schema::exception const& e) - { - cerr << "xml_schema::exception: " << e.what () << endl; - return 1; - } -} diff --git a/tests/cxx/tree/encoding/char/lcp/makefile b/tests/cxx/tree/encoding/char/lcp/makefile deleted file mode 100644 index bb99e33..0000000 --- a/tests/cxx/tree/encoding/char/lcp/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/encoding/char/lcp/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-serialization --char-encoding lcp -$(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)/test.std - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/test.std -,$(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/encoding/char/lcp/test.std b/tests/cxx/tree/encoding/char/lcp/test.std deleted file mode 100644 index 368826d..0000000 --- a/tests/cxx/tree/encoding/char/lcp/test.std +++ /dev/null @@ -1,4 +0,0 @@ - - - abcd - diff --git a/tests/cxx/tree/encoding/char/lcp/test.xml b/tests/cxx/tree/encoding/char/lcp/test.xml deleted file mode 100644 index 772512e..0000000 --- a/tests/cxx/tree/encoding/char/lcp/test.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - abcd - - diff --git a/tests/cxx/tree/encoding/char/lcp/test.xsd b/tests/cxx/tree/encoding/char/lcp/test.xsd deleted file mode 100644 index 1e264e3..0000000 --- a/tests/cxx/tree/encoding/char/lcp/test.xsd +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/cxx/tree/encoding/char/makefile b/tests/cxx/tree/encoding/char/makefile deleted file mode 100644 index cd7a325..0000000 --- a/tests/cxx/tree/encoding/char/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/encoding/char/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make - -tests := lcp utf-8 iso-8859-1 - -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/encoding/char/utf-8/driver.cxx b/tests/cxx/tree/encoding/char/utf-8/driver.cxx deleted file mode 100644 index 38fae4d..0000000 --- a/tests/cxx/tree/encoding/char/utf-8/driver.cxx +++ /dev/null @@ -1,63 +0,0 @@ -// file : tests/cxx/tree/encoding/char/utf-8/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test UTF-8 encoding. -// - -#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])); - - { - type::a_sequence const& s (r->a ()); - - if (s[0] != "abc" || - s[1] != "\xD5\x95" || - s[2] != "\xEA\xAA\xAA") - { - cerr << "invalid encoding" << endl; - return 1; - } - } - - { - type::b_sequence const& s (r->b ()); - - if (s[0] != strenum::abc || - s[1] != strenum::a_c || - s[2] != strenum::cxx_bc) - { - cerr << "invalid encoding" << endl; - return 1; - } - } - - xml_schema::namespace_infomap map; - map["t"].name = "test"; - - root (std::cout, *r, map, "ASCII"); - } - catch (xml_schema::exception const& e) - { - cerr << "xml_schema::exception: " << e.what () << endl; - return 1; - } -} diff --git a/tests/cxx/tree/encoding/char/utf-8/makefile b/tests/cxx/tree/encoding/char/utf-8/makefile deleted file mode 100644 index fd465f3..0000000 --- a/tests/cxx/tree/encoding/char/utf-8/makefile +++ /dev/null @@ -1,85 +0,0 @@ -# file : tests/cxx/tree/encoding/char/utf-8/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-serialization --generate-doxygen -$(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)/test.std - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/test.std -,$(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/encoding/char/utf-8/test.std b/tests/cxx/tree/encoding/char/utf-8/test.std deleted file mode 100644 index fdfef4c..0000000 --- a/tests/cxx/tree/encoding/char/utf-8/test.std +++ /dev/null @@ -1,9 +0,0 @@ - - - abc - Օ - ꪪ - abc - aՕc - ꪪbc - diff --git a/tests/cxx/tree/encoding/char/utf-8/test.xml b/tests/cxx/tree/encoding/char/utf-8/test.xml deleted file mode 100644 index 0d3e27a..0000000 --- a/tests/cxx/tree/encoding/char/utf-8/test.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - abc - Օ - ꪪ - - abc - aՕc - ꪪbc - - diff --git a/tests/cxx/tree/encoding/char/utf-8/test.xsd b/tests/cxx/tree/encoding/char/utf-8/test.xsd deleted file mode 100644 index d5ee868..0000000 --- a/tests/cxx/tree/encoding/char/utf-8/test.xsd +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - Test enum. Valid values are: - abc - aՕc - ꪪbc - - - - - - - - - - - - - - - - - - - - diff --git a/tests/cxx/tree/encoding/makefile b/tests/cxx/tree/encoding/makefile deleted file mode 100644 index b6f2ea6..0000000 --- a/tests/cxx/tree/encoding/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/cxx/tree/encoding/makefile -# license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make - -tests := char wchar - -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/encoding/wchar/driver.cxx b/tests/cxx/tree/encoding/wchar/driver.cxx deleted file mode 100644 index 0756d4e..0000000 --- a/tests/cxx/tree/encoding/wchar/driver.cxx +++ /dev/null @@ -1,55 +0,0 @@ -// file : tests/cxx/tree/encoding/wchar/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test the wide character mapping. -// - -#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 - { - // Use dont_validate because we do not have instance's system id (path). - // - std::ifstream ifs (argv[1]); - XSD_AUTO_PTR r (root (ifs, xml_schema::flags::dont_validate)); - - { - type::b_sequence const& s (r->b ()); - - if (s[0] != strenum::abc || - s[1] != strenum::a__c || - s[2] != strenum::cxx__bc || - s[3] != strenum::ab__) - { - cerr << "invalid encoding" << endl; - return 1; - } - } - - xml_schema::namespace_infomap map; - map[L"t"].name = L"test"; - - root (std::cout, *r, map, L"ASCII"); - } - catch (xml_schema::exception const& e) - { - cerr << "xml_schema::exception: " << e.what () << endl; - return 1; - } -} diff --git a/tests/cxx/tree/encoding/wchar/makefile b/tests/cxx/tree/encoding/wchar/makefile deleted file mode 100644 index 1e351fa..0000000 --- a/tests/cxx/tree/encoding/wchar/makefile +++ /dev/null @@ -1,86 +0,0 @@ -# file : tests/cxx/tree/encoding/wchar/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-serialization --generate-doxygen \ ---char-type wchar_t -$(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)/test.std - $(call message,test $$1,$$1 $(src_base)/test.xml | diff -u $(src_base)/test.std -,$(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/encoding/wchar/test.std b/tests/cxx/tree/encoding/wchar/test.std deleted file mode 100644 index e0eaef0..0000000 --- a/tests/cxx/tree/encoding/wchar/test.std +++ /dev/null @@ -1,10 +0,0 @@ - - - abc - ῿퟿ - ကჿ - abc - a῿퟿c - ကჿbc - abကჿ - diff --git a/tests/cxx/tree/encoding/wchar/test.xml b/tests/cxx/tree/encoding/wchar/test.xml deleted file mode 100644 index 9abb1b6..0000000 --- a/tests/cxx/tree/encoding/wchar/test.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - abc - ῿퟿ - ကჿ - - abc - a῿퟿c - ကჿbc - abကჿ - - diff --git a/tests/cxx/tree/encoding/wchar/test.xsd b/tests/cxx/tree/encoding/wchar/test.xsd deleted file mode 100644 index 0151d2f..0000000 --- a/tests/cxx/tree/encoding/wchar/test.xsd +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - Test enum. Valid values are: - abc - a῿퟿c - ကჿbc - abကჿ - - - - - - - - - - - - - - - - - - - - - -- cgit v1.1