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/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 ------------ 5 files changed, 198 deletions(-) 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/wchar') 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