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/parser/recursive/driver.cxx | 139 ---------------------------------- tests/cxx/parser/recursive/makefile | 83 -------------------- tests/cxx/parser/recursive/output | 22 ------ tests/cxx/parser/recursive/test.xml | 11 --- tests/cxx/parser/recursive/test.xsd | 27 ------- 5 files changed, 282 deletions(-) delete mode 100644 tests/cxx/parser/recursive/driver.cxx delete mode 100644 tests/cxx/parser/recursive/makefile delete mode 100644 tests/cxx/parser/recursive/output delete mode 100644 tests/cxx/parser/recursive/test.xml delete mode 100644 tests/cxx/parser/recursive/test.xsd (limited to 'tests/cxx/parser/recursive') diff --git a/tests/cxx/parser/recursive/driver.cxx b/tests/cxx/parser/recursive/driver.cxx deleted file mode 100644 index 39c6621..0000000 --- a/tests/cxx/parser/recursive/driver.cxx +++ /dev/null @@ -1,139 +0,0 @@ -// file : tests/cxx/parser/recursive/driver.cxx -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -// Test recursive parser invocation. -// - -#include -#include - -#include "test-pskel.hxx" - -using namespace std; - -struct sub_pimpl: sub_type_pskel -{ - virtual void - pre () - { - cout << "sub::pre" << endl; - } - - virtual void - sub () - { - cout << "sub::sub" << endl; - } - - virtual void - sub2 () - { - cout << "sub::sub2" << endl; - } - - virtual void - name (string const& n) - { - cout << "sub::name: " << n << endl; - } - - virtual void - post_sub_type () - { - cout << "sub::post" << endl; - } -}; - -struct indir_pimpl: indir_type_pskel -{ - virtual void - pre () - { - cout << "indir::pre" << endl; - } - - virtual void - sub () - { - cout << "indir::sub" << endl; - } - - virtual void - name (string const& n) - { - cout << "indir::name: " << n << endl; - } - - virtual void - post_indir_type () - { - cout << "indir::post" << endl; - } -}; - -struct test_pimpl: test_type_pskel -{ - virtual void - pre () - { - cout << "test::pre" << endl; - } - - virtual void - sub () - { - cout << "test::sub" << endl; - } - - virtual void - name (string const& n) - { - cout << "test::name: " << n << endl; - } - - virtual void - post_test_type () - { - cout << "test::post" << endl; - } -}; - - -int -main (int argc, char* argv[]) -{ - if (argc != 2) - { - cerr << "usage: " << argv[0] << " test.xml" << endl; - return 1; - } - - try - { - xml_schema::string_pimpl string_p; - - sub_pimpl sub_p; - indir_pimpl indir_p; - test_pimpl test_p; - - sub_p.parsers (sub_p, indir_p, sub_p, string_p); - indir_p.parsers (sub_p, string_p); - test_p.parsers (sub_p, string_p); - - xml_schema::document doc_p (test_p, "test"); - - test_p.pre (); - doc_p.parse (argv[1]); - test_p.post_test_type (); - } - catch (xml_schema::exception const& e) - { - cerr << e << endl; - return 1; - } - catch (ios_base::failure const&) - { - cerr << "io failure" << endl; - return 1; - } -} diff --git a/tests/cxx/parser/recursive/makefile b/tests/cxx/parser/recursive/makefile deleted file mode 100644 index a1bc9ab..0000000 --- a/tests/cxx/parser/recursive/makefile +++ /dev/null @@ -1,83 +0,0 @@ -# file : tests/cxx/parser/recursive/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=-pskel.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=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) -gen := $(addprefix $(out_base)/,$(genf)) - -$(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options += --generate-validation -$(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=-pskel.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/parser/xsd-cxx.make) -endif - - -# Dependencies. -# -$(call import,$(src_root)/xsd/makefile) diff --git a/tests/cxx/parser/recursive/output b/tests/cxx/parser/recursive/output deleted file mode 100644 index f26fb72..0000000 --- a/tests/cxx/parser/recursive/output +++ /dev/null @@ -1,22 +0,0 @@ -test::pre -test::name: testName -sub::pre -sub::name: subName -sub::pre -sub::name: sub-subName -sub::post -sub::sub -indir::pre -indir::name: sub-indirName -sub::pre -sub::name: sub-indir-subName -sub::post -indir::sub -indir::post -sub::pre -sub::name: sub-sub2Name -sub::post -sub::sub2 -sub::post -test::sub -test::post diff --git a/tests/cxx/parser/recursive/test.xml b/tests/cxx/parser/recursive/test.xml deleted file mode 100644 index f6c219d..0000000 --- a/tests/cxx/parser/recursive/test.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/tests/cxx/parser/recursive/test.xsd b/tests/cxx/parser/recursive/test.xsd deleted file mode 100644 index 33e1d2d..0000000 --- a/tests/cxx/parser/recursive/test.xsd +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.1