From 8e761289a2446367267c6c0d9a26e734f0f78306 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 16 Dec 2020 20:29:05 +0300 Subject: Get rid of legacy build systems and rename cutl/ to libcutl/ --- tests/Makefile.am | 4 - tests/buildfile | 2 +- tests/compiler/cxx-indenter/driver.cxx | 4 +- tests/compiler/cxx-indenter/makefile | 69 -------- tests/compiler/makefile | 16 -- tests/compiler/sloc-counter/driver.cxx | 4 +- tests/compiler/sloc-counter/makefile | 69 -------- tests/compiler/traversal/driver.cxx | 6 +- tests/compiler/traversal/makefile | 69 -------- tests/container/makefile | 16 -- tests/container/multi-index/driver.cxx | 2 +- tests/container/multi-index/makefile | 68 -------- tests/fs/makefile | 16 -- tests/fs/path/driver.cxx | 2 +- tests/fs/path/makefile | 68 -------- tests/makefile | 25 --- tests/re/driver.cxx | 2 +- tests/re/makefile | 68 -------- tests/shared-ptr/driver.cxx | 2 +- tests/shared-ptr/makefile | 68 -------- tests/xml/makefile | 16 -- tests/xml/parser/driver.cxx | 309 --------------------------------- tests/xml/parser/makefile | 68 -------- tests/xml/roundtrip/attribute.xml | 3 - tests/xml/roundtrip/characters.xml | 84 --------- tests/xml/roundtrip/driver.cxx | 126 -------------- tests/xml/roundtrip/followup-1.xml | 8 - tests/xml/roundtrip/followup-2.xml | 1 - tests/xml/roundtrip/makefile | 73 -------- tests/xml/roundtrip/namespace.xml | 6 - tests/xml/serializer/driver.cxx | 62 ------- tests/xml/serializer/makefile | 68 -------- 32 files changed, 12 insertions(+), 1392 deletions(-) delete mode 100644 tests/Makefile.am delete mode 100644 tests/compiler/cxx-indenter/makefile delete mode 100644 tests/compiler/makefile delete mode 100644 tests/compiler/sloc-counter/makefile delete mode 100644 tests/compiler/traversal/makefile delete mode 100644 tests/container/makefile delete mode 100644 tests/container/multi-index/makefile delete mode 100644 tests/fs/makefile delete mode 100644 tests/fs/path/makefile delete mode 100644 tests/makefile delete mode 100644 tests/re/makefile delete mode 100644 tests/shared-ptr/makefile delete mode 100644 tests/xml/makefile delete mode 100644 tests/xml/parser/driver.cxx delete mode 100644 tests/xml/parser/makefile delete mode 100644 tests/xml/roundtrip/attribute.xml delete mode 100644 tests/xml/roundtrip/characters.xml delete mode 100644 tests/xml/roundtrip/driver.cxx delete mode 100644 tests/xml/roundtrip/followup-1.xml delete mode 100644 tests/xml/roundtrip/followup-2.xml delete mode 100644 tests/xml/roundtrip/makefile delete mode 100644 tests/xml/roundtrip/namespace.xml delete mode 100644 tests/xml/serializer/driver.cxx delete mode 100644 tests/xml/serializer/makefile (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 6cf9c54..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -# file : Makefile.am -# license : MIT; see accompanying LICENSE file - -SUBDIRS = __path__(dirs) diff --git a/tests/buildfile b/tests/buildfile index 3026620..556ed55 100644 --- a/tests/buildfile +++ b/tests/buildfile @@ -1,4 +1,4 @@ # file : tests/buildfile # license : MIT; see accompanying LICENSE file -./: {*/ -build/ -xml/} +./: {*/ -build/} diff --git a/tests/compiler/cxx-indenter/driver.cxx b/tests/compiler/cxx-indenter/driver.cxx index e0715d3..c73aa8d 100644 --- a/tests/compiler/cxx-indenter/driver.cxx +++ b/tests/compiler/cxx-indenter/driver.cxx @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include using namespace std; using namespace cutl::compiler; diff --git a/tests/compiler/cxx-indenter/makefile b/tests/compiler/cxx-indenter/makefile deleted file mode 100644 index c586f14..0000000 --- a/tests/compiler/cxx-indenter/makefile +++ /dev/null @@ -1,69 +0,0 @@ -# file : tests/compiler/cxx-indenter/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/output.std - $(call message,test $$1,$$1 | diff -u $(src_base)/output.std -,$(driver)) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(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) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) diff --git a/tests/compiler/makefile b/tests/compiler/makefile deleted file mode 100644 index 457a0c1..0000000 --- a/tests/compiler/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/compiler/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -tests := cxx-indenter sloc-counter traversal - -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/compiler/sloc-counter/driver.cxx b/tests/compiler/sloc-counter/driver.cxx index 470df0e..c85c571 100644 --- a/tests/compiler/sloc-counter/driver.cxx +++ b/tests/compiler/sloc-counter/driver.cxx @@ -6,8 +6,8 @@ #include #include -#include -#include +#include +#include using namespace std; using namespace cutl::compiler; diff --git a/tests/compiler/sloc-counter/makefile b/tests/compiler/sloc-counter/makefile deleted file mode 100644 index f2f7de0..0000000 --- a/tests/compiler/sloc-counter/makefile +++ /dev/null @@ -1,69 +0,0 @@ -# file : tests/compiler/sloc-counter/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/test.cxx $(src_base)/test.std - $(call message,test $$1,$$1 $(src_base)/test.cxx | diff -u $(src_base)/test.std -,$(driver)) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(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) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) diff --git a/tests/compiler/traversal/driver.cxx b/tests/compiler/traversal/driver.cxx index 7d5f8c6..e7948f5 100644 --- a/tests/compiler/traversal/driver.cxx +++ b/tests/compiler/traversal/driver.cxx @@ -4,10 +4,10 @@ #include #include -#include +#include -#include -#include +#include +#include using namespace std; using namespace cutl; diff --git a/tests/compiler/traversal/makefile b/tests/compiler/traversal/makefile deleted file mode 100644 index d4ba615..0000000 --- a/tests/compiler/traversal/makefile +++ /dev/null @@ -1,69 +0,0 @@ -# file : tests/compiler/traversal/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): driver := $(driver) -$(test): $(driver) $(src_base)/output.std - $(call message,test $$1,$$1 | diff -u $(src_base)/output.std -,$(driver)) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(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) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) diff --git a/tests/container/makefile b/tests/container/makefile deleted file mode 100644 index 9773524..0000000 --- a/tests/container/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/container/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -tests := multi-index - -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/container/multi-index/driver.cxx b/tests/container/multi-index/driver.cxx index 73728d2..6d4aa50 100644 --- a/tests/container/multi-index/driver.cxx +++ b/tests/container/multi-index/driver.cxx @@ -7,7 +7,7 @@ #include #include -#include +#include using namespace std; using namespace cutl::container; diff --git a/tests/container/multi-index/makefile b/tests/container/multi-index/makefile deleted file mode 100644 index 4499e8f..0000000 --- a/tests/container/multi-index/makefile +++ /dev/null @@ -1,68 +0,0 @@ -# file : tests/container/multi-index/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): $(driver) - $(call message,test $<,$<) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(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) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) diff --git a/tests/fs/makefile b/tests/fs/makefile deleted file mode 100644 index b685a11..0000000 --- a/tests/fs/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/fs/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -tests := path - -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/fs/path/driver.cxx b/tests/fs/path/driver.cxx index faf4703..ca1f2b6 100644 --- a/tests/fs/path/driver.cxx +++ b/tests/fs/path/driver.cxx @@ -4,7 +4,7 @@ #include #include -#include +#include using std::cerr; using std::endl; diff --git a/tests/fs/path/makefile b/tests/fs/path/makefile deleted file mode 100644 index fa101ee..0000000 --- a/tests/fs/path/makefile +++ /dev/null @@ -1,68 +0,0 @@ -# file : tests/fs/path/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): $(driver) - $(call message,test $<,$<) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(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) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) diff --git a/tests/makefile b/tests/makefile deleted file mode 100644 index 748a30d..0000000 --- a/tests/makefile +++ /dev/null @@ -1,25 +0,0 @@ -# file : tests/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make - -tests := compiler container fs re shared-ptr - -default := $(out_base)/ -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) - -$(dist): export dirs := -$(dist): #$(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) - $(call meta-automake) - -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/automake.make) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/re/driver.cxx b/tests/re/driver.cxx index a88638f..bfa0e05 100644 --- a/tests/re/driver.cxx +++ b/tests/re/driver.cxx @@ -5,7 +5,7 @@ #include #include -#include +#include using namespace cutl::re; diff --git a/tests/re/makefile b/tests/re/makefile deleted file mode 100644 index 409ecf4..0000000 --- a/tests/re/makefile +++ /dev/null @@ -1,68 +0,0 @@ -# file : tests/re/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): $(driver) - $(call message,test $<,$<) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(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) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) diff --git a/tests/shared-ptr/driver.cxx b/tests/shared-ptr/driver.cxx index e0f9f78..4b184ac 100644 --- a/tests/shared-ptr/driver.cxx +++ b/tests/shared-ptr/driver.cxx @@ -4,7 +4,7 @@ #include #include -#include +#include using namespace cutl; diff --git a/tests/shared-ptr/makefile b/tests/shared-ptr/makefile deleted file mode 100644 index c4b2055..0000000 --- a/tests/shared-ptr/makefile +++ /dev/null @@ -1,68 +0,0 @@ -# file : tests/shared-ptr/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): $(driver) - $(call message,test $<,$<) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(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) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) diff --git a/tests/xml/makefile b/tests/xml/makefile deleted file mode 100644 index f3adbea..0000000 --- a/tests/xml/makefile +++ /dev/null @@ -1,16 +0,0 @@ -# file : tests/xml/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -tests := parser serializer roundtrip - -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/xml/parser/driver.cxx b/tests/xml/parser/driver.cxx deleted file mode 100644 index 38fc7f2..0000000 --- a/tests/xml/parser/driver.cxx +++ /dev/null @@ -1,309 +0,0 @@ -// file : tests/xml/parser/driver.cxx -// license : MIT; see accompanying LICENSE file - -#include -#include -#include -#include - -#include - -using namespace std; -namespace xml = cutl::xml; -using namespace xml; - -int -main () -{ - // Test error handling. - // - try - { - istringstream is ("X"); - parser p (is, "test"); - - assert (p.next () == parser::start_element); - assert (p.next () == parser::start_element); - assert (p.next () == parser::characters && p.value () == "X"); - p.next (); - assert (false); - } - catch (const xml::exception& e) - { - // cerr << e.what () << endl; - } - - try - { - istringstream is (""); - is.exceptions (ios_base::badbit | ios_base::failbit); - parser p (is, "test"); - - is.setstate (ios_base::badbit); - p.next (); - assert (false); - } - catch (const ios_base::failure& e) - { - } - - // Test the next_expect() functionality. - // - { - istringstream is (""); - parser p (is, "test"); - p.next_expect (parser::start_element, "root"); - p.next_expect (parser::end_element); - } - - try - { - istringstream is (""); - parser p (is, "test"); - p.next_expect (parser::end_element); - assert (false); - } - catch (const xml::exception& e) - { - // cerr << e.what () << endl; - } - - try - { - istringstream is (""); - parser p (is, "test"); - p.next_expect (parser::start_element, "root1"); - assert (false); - } - catch (const xml::exception& e) - { - // cerr << e.what () << endl; - } - - // Test attribute maps. - // - { - istringstream is (""); - parser p (is, "test"); - p.next_expect (parser::start_element, "root"); - - assert (p.attribute ("a") == "a"); - assert (p.attribute ("b", "B") == "b"); - assert (p.attribute ("c", "C") == "C"); - assert (p.attribute ("d") == 123); - assert (p.attribute ("t") == true); - assert (p.attribute ("f", false) == false); - - p.next_expect (parser::end_element); - } - - { - istringstream is (""); - parser p (is, "test"); - p.next_expect (parser::start_element, "root"); - assert (p.attribute ("a") == "a"); - assert (p.peek () == parser::start_element && p.name () == "nested"); - assert (p.attribute ("a") == "a"); - p.next_expect (parser::start_element, "nested"); - assert (p.attribute ("a") == "A"); - p.next_expect (parser::start_element, "inner"); - assert (p.attribute ("a", "") == ""); - p.next_expect (parser::end_element); - assert (p.attribute ("a") == "A"); - assert (p.peek () == parser::end_element); - assert (p.attribute ("a") == "A"); // Still valid. - p.next_expect (parser::end_element); - assert (p.attribute ("a") == "a"); - p.next_expect (parser::end_element); - assert (p.attribute ("a", "") == ""); - } - - try - { - istringstream is (""); - parser p (is, "test"); - p.next_expect (parser::start_element, "root"); - assert (p.attribute ("a") == "a"); - p.next_expect (parser::end_element); - assert (false); - } - catch (const xml::exception& e) - { - // cerr << e.what () << endl; - } - - try - { - istringstream is (""); - parser p (is, "test"); - p.next_expect (parser::start_element, "root"); - p.attribute ("a"); - assert (false); - } - catch (const xml::exception& e) - { - // cerr << e.what () << endl; - } - - // Test peeking and getting the current event. - // - { - istringstream is ("x"); - parser p (is, "peek", - parser::receive_default | parser::receive_attributes_event); - - assert (p.event () == parser::eof); - - assert (p.peek () == parser::start_element); - assert (p.next () == parser::start_element); - assert (p.event () == parser::start_element); - - assert (p.peek () == parser::start_attribute); - assert (p.event () == parser::start_attribute); - assert (p.next () == parser::start_attribute); - - assert (p.peek () == parser::characters && p.value () == "x"); - assert (p.next () == parser::characters && p.value () == "x"); - assert (p.event () == parser::characters && p.value () == "x"); - - assert (p.peek () == parser::end_attribute); - assert (p.event () == parser::end_attribute); - assert (p.next () == parser::end_attribute); - - assert (p.peek () == parser::characters && p.value () == "x"); - assert (p.next () == parser::characters && p.value () == "x"); - assert (p.event () == parser::characters && p.value () == "x"); - - assert (p.peek () == parser::start_element); - assert (p.next () == parser::start_element); - assert (p.event () == parser::start_element); - - assert (p.peek () == parser::end_element); - assert (p.next () == parser::end_element); - assert (p.event () == parser::end_element); - - assert (p.peek () == parser::end_element); - assert (p.next () == parser::end_element); - assert (p.event () == parser::end_element); - - assert (p.peek () == parser::eof); - assert (p.next () == parser::eof); - assert (p.event () == parser::eof); - } - - // Test content processing. - // - - // empty - // - { - istringstream is (" \n\t "); - parser p (is, "empty", - parser::receive_default | parser::receive_attributes_event); - - assert (p.next () == parser::start_element); - p.content (parser::empty); - assert (p.next () == parser::start_attribute); - assert (p.next () == parser::characters && p.value () == " x "); - assert (p.next () == parser::end_attribute); - assert (p.next () == parser::end_element); - assert (p.next () == parser::eof); - } - - try - { - istringstream is (" \n & X \t "); - parser p (is, "empty"); - - assert (p.next () == parser::start_element); - p.content (parser::empty); - p.next (); - assert (false); - } - catch (const xml::exception& e) - { - // cerr << e.what () << endl; - } - - // simple - // - { - istringstream is (" X "); - parser p (is, "simple"); - - assert (p.next () == parser::start_element); - p.content (parser::simple); - assert (p.next () == parser::characters && p.value () == " X "); - assert (p.next () == parser::end_element); - assert (p.next () == parser::eof); - } - - try - { - istringstream is (" ? "); - parser p (is, "simple"); - - assert (p.next () == parser::start_element); - p.content (parser::simple); - assert (p.next () == parser::characters && p.value () == " ? "); - p.next (); - assert (false); - } - catch (const xml::exception& e) - { - // cerr << e.what () << endl; - } - - // complex - // - { - istringstream is ("\n" - " \n" - " \n" - " X \n" - " \n" - "\n"); - parser p (is, "complex", - parser::receive_default | parser::receive_attributes_event); - - assert (p.next () == parser::start_element); // root - p.content (parser::complex); - - assert (p.next () == parser::start_attribute); - assert (p.next () == parser::characters && p.value () == " x "); - assert (p.next () == parser::end_attribute); - - assert (p.next () == parser::start_element); // nested - p.content (parser::complex); - - assert (p.next () == parser::start_element); // inner - p.content (parser::empty); - assert (p.next () == parser::end_element); // inner - - assert (p.next () == parser::start_element); // inner - p.content (parser::simple); - assert (p.next () == parser::characters && p.value () == " X "); - assert (p.next () == parser::end_element); // inner - - assert (p.next () == parser::end_element); // nested - assert (p.next () == parser::end_element); // root - assert (p.next () == parser::eof); - } - - try - { - istringstream is (" \n X X "); - parser p (is, "complex"); - - assert (p.next () == parser::start_element); - p.content (parser::complex); - assert (p.next () == parser::start_element); - assert (p.next () == parser::end_element); - p.next (); - assert (false); - } - catch (const xml::exception& e) - { - // cerr << e.what () << endl; - } -} diff --git a/tests/xml/parser/makefile b/tests/xml/parser/makefile deleted file mode 100644 index 7a53f94..0000000 --- a/tests/xml/parser/makefile +++ /dev/null @@ -1,68 +0,0 @@ -# file : tests/xml/parser/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): $(driver) - $(call message,test $<,$<) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(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) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) diff --git a/tests/xml/roundtrip/attribute.xml b/tests/xml/roundtrip/attribute.xml deleted file mode 100644 index ca32460..0000000 --- a/tests/xml/roundtrip/attribute.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/tests/xml/roundtrip/characters.xml b/tests/xml/roundtrip/characters.xml deleted file mode 100644 index fab909b..0000000 --- a/tests/xml/roundtrip/characters.xml +++ /dev/null @@ -1,84 +0,0 @@ - - -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - - diff --git a/tests/xml/roundtrip/driver.cxx b/tests/xml/roundtrip/driver.cxx deleted file mode 100644 index 51ca472..0000000 --- a/tests/xml/roundtrip/driver.cxx +++ /dev/null @@ -1,126 +0,0 @@ -// file : tests/xml/roundtrip/driver.cxx -// license : MIT; see accompanying LICENSE file - -#include -#include -#include -#include - -#include -#include - -using namespace std; -namespace xml = cutl::xml; -using namespace xml; - -const bool trace = false; - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " " << endl; - return 1; - } - - try - { - ifstream ifs; - ifs.exceptions (ifstream::badbit | ifstream::failbit); - ifs.open (argv[1], ifstream::in | ifstream::binary); - - parser p (ifs, - argv[1], - parser::receive_default | - parser::receive_attributes_event | - parser::receive_namespace_decls); - - serializer s (cout, "out", 0); - - bool in_attr (false); - for (parser::event_type e (p.next ()); e != parser::eof; e = p.next ()) - { - switch (e) - { - case parser::start_element: - { - if (trace) - cerr << p.line () << ':' << p.column () << ": " << e << " " - << p.namespace_() << (p.namespace_().empty () ? "" : "#") - << p.prefix () << (p.prefix ().empty () ? "" : ":") - << p.name () << endl; - - s.start_element (p.qname ()); - break; - } - case parser::end_element: - { - if (trace) - cerr << p.line () << ':' << p.column () << ": " << e << " " - << p.namespace_() << (p.namespace_().empty () ? "" : "#") - << p.prefix () << (p.prefix ().empty () ? "" : ":") - << p.name () << endl; - - s.end_element (); - break; - } - case parser::start_namespace_decl: - { - if (trace) - cerr << " " << p.prefix () << "->" << p.namespace_ () << endl; - - s.namespace_decl (p.namespace_ (), p.prefix ()); - break; - } - case parser::end_namespace_decl: - { - if (trace) - cerr << " " << p.prefix () << "-x" << endl; - - break; - } - case parser::start_attribute: - { - if (trace) - cerr << " " << p.qname () << "="; - - s.start_attribute (p.qname ()); - in_attr = true; - break; - } - case parser::end_attribute: - { - s.end_attribute (); - in_attr = false; - break; - } - case parser::characters: - { - if (trace) - { - if (!in_attr) - cerr << p.line () << ':' << p.column () << ": " << e << " "; - - cerr << "'" << p.value () << "'" << endl; - } - - s.characters (p.value ()); - break; - } - default: - break; - } - } - } - catch (const ios_base::failure& e) - { - cerr << "io failure" << endl; - return 1; - } - catch (const xml::exception& e) - { - cerr << e.what () << endl; - return 1; - } -} diff --git a/tests/xml/roundtrip/followup-1.xml b/tests/xml/roundtrip/followup-1.xml deleted file mode 100644 index c2a3b22..0000000 --- a/tests/xml/roundtrip/followup-1.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - x - - - - foo&bar - diff --git a/tests/xml/roundtrip/followup-2.xml b/tests/xml/roundtrip/followup-2.xml deleted file mode 100644 index 70171eb..0000000 --- a/tests/xml/roundtrip/followup-2.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tests/xml/roundtrip/makefile b/tests/xml/roundtrip/makefile deleted file mode 100644 index 342bc15..0000000 --- a/tests/xml/roundtrip/makefile +++ /dev/null @@ -1,73 +0,0 @@ -# file : tests/xml/roundtrip/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): tests := attribute.xml namespace.xml followup-1.xml followup-2.xml \ -characters.xml - -$(test): test_body = $(call message,test $< $1,$< $(src_base)/$1 >$(out_base)/test.out)$(literal_newline)\ -$(literal_tab)$(call message,,diff -u $(src_base)/$1 $(out_base)/test.out)$(literal_newline)\ -$(literal_tab)$(call message,,rm -f $(out_base)/test.out)$(literal_newline) -$(test): $(driver) - $(foreach t,$(tests),$(call test_body,$t)) - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(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) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) diff --git a/tests/xml/roundtrip/namespace.xml b/tests/xml/roundtrip/namespace.xml deleted file mode 100644 index 4a5642e..0000000 --- a/tests/xml/roundtrip/namespace.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - X - - - diff --git a/tests/xml/serializer/driver.cxx b/tests/xml/serializer/driver.cxx deleted file mode 100644 index 692ade2..0000000 --- a/tests/xml/serializer/driver.cxx +++ /dev/null @@ -1,62 +0,0 @@ -// file : tests/xml/serializer/driver.cxx -// license : MIT; see accompanying LICENSE file - -#include -#include -#include -#include - -#include - -using namespace std; -namespace xml = cutl::xml; -using namespace xml; - -int -main () -{ - // Test error handling. - // - try - { - ostringstream os; - serializer s (os, "test"); - - s.attribute ("foo", "bar"); - assert (false); - } - catch (const xml::exception& e) - { - // cerr << e.what () << endl; - } - - try - { - ostringstream os; - os.exceptions (ios_base::badbit | ios_base::failbit); - serializer s (os, "test"); - - s.start_element ("root"); - s.characters ("one"); - os.setstate (ios_base::badbit); - s.characters ("two"); - assert (false); - } - catch (const ios_base::failure& e) - { - } - - // Test value serialization. - // - { - ostringstream os; - serializer s (os, "test", 0); - - s.start_element ("root"); - s.attribute ("version", 123); - s.characters (true); - s.end_element (); - - assert (os.str () == "true\n"); - } -} diff --git a/tests/xml/serializer/makefile b/tests/xml/serializer/makefile deleted file mode 100644 index 38a260f..0000000 --- a/tests/xml/serializer/makefile +++ /dev/null @@ -1,68 +0,0 @@ -# file : tests/xml/serializer/makefile -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): $(driver) - $(call message,test $<,$<) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(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) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) -- cgit v1.1