From 5e527213a2430bb3018e5eebd909aef294edf9b5 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 18 Dec 2020 18:48:46 +0300
Subject: Switch to build2

---
 tests/cxx/tree/enumeration/ctor/driver.cxx        | 30 --------
 tests/cxx/tree/enumeration/ctor/makefile          | 86 -----------------------
 tests/cxx/tree/enumeration/ctor/test.xsd          | 41 -----------
 tests/cxx/tree/enumeration/inheritance/driver.cxx | 53 --------------
 tests/cxx/tree/enumeration/inheritance/makefile   | 85 ----------------------
 tests/cxx/tree/enumeration/inheritance/output     |  1 -
 tests/cxx/tree/enumeration/inheritance/test.xml   |  3 -
 tests/cxx/tree/enumeration/inheritance/test.xsd   | 22 ------
 tests/cxx/tree/enumeration/makefile               | 16 -----
 9 files changed, 337 deletions(-)
 delete mode 100644 tests/cxx/tree/enumeration/ctor/driver.cxx
 delete mode 100644 tests/cxx/tree/enumeration/ctor/makefile
 delete mode 100644 tests/cxx/tree/enumeration/ctor/test.xsd
 delete mode 100644 tests/cxx/tree/enumeration/inheritance/driver.cxx
 delete mode 100644 tests/cxx/tree/enumeration/inheritance/makefile
 delete mode 100644 tests/cxx/tree/enumeration/inheritance/output
 delete mode 100644 tests/cxx/tree/enumeration/inheritance/test.xml
 delete mode 100644 tests/cxx/tree/enumeration/inheritance/test.xsd
 delete mode 100644 tests/cxx/tree/enumeration/makefile

(limited to 'tests/cxx/tree/enumeration')

diff --git a/tests/cxx/tree/enumeration/ctor/driver.cxx b/tests/cxx/tree/enumeration/ctor/driver.cxx
deleted file mode 100644
index beda424..0000000
--- a/tests/cxx/tree/enumeration/ctor/driver.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-// file      : tests/cxx/tree/enumeration/ctor/driver.cxx
-// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test enumeration constructors.
-//
-#include <string>
-
-#include "test.hxx"
-
-using namespace std;
-using namespace test;
-
-int
-main ()
-{
-  // Test ctor(const char*).
-  //
-  {
-    string_enum se ("a");
-    type t ("a", 1);
-  }
-
-  // Test ctor(const std::string&)
-  //
-  {
-    string const s ("c");
-    string_enum se (s);
-    type t (s, 3);
-  }
-}
diff --git a/tests/cxx/tree/enumeration/ctor/makefile b/tests/cxx/tree/enumeration/ctor/makefile
deleted file mode 100644
index 463997b..0000000
--- a/tests/cxx/tree/enumeration/ctor/makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# file      : tests/cxx/tree/enumeration/ctor/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-default-ctor --generate-from-base-ctor \
---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)
-	$(call message,test $$1,$$1,$(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/enumeration/ctor/test.xsd b/tests/cxx/tree/enumeration/ctor/test.xsd
deleted file mode 100644
index c5d625a..0000000
--- a/tests/cxx/tree/enumeration/ctor/test.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
-  <simpleType name="string-enum-base">
-    <restriction base="string">
-      <enumeration value="a"/>
-      <enumeration value="b"/>
-      <enumeration value="c"/>
-    </restriction>
-  </simpleType>
-
-  <simpleType name="string-enum">
-    <restriction base="t:string-enum-base">
-      <enumeration value="a"/>
-      <enumeration value="c"/>
-    </restriction>
-  </simpleType>
-
-  <simpleType name="int-enum-base">
-    <restriction base="int">
-      <enumeration value="1"/>
-      <enumeration value="2"/>
-      <enumeration value="3"/>
-    </restriction>
-  </simpleType>
-
-  <simpleType name="int-enum">
-    <restriction base="t:int-enum-base">
-      <enumeration value="1"/>
-      <enumeration value="3"/>
-    </restriction>
-  </simpleType>
-
-  <complexType name="type">
-    <sequence>
-      <element name="a" type="t:string-enum"/>
-      <element name="b" type="t:int-enum"/>
-    </sequence>
-  </complexType>
-
-</schema>
diff --git a/tests/cxx/tree/enumeration/inheritance/driver.cxx b/tests/cxx/tree/enumeration/inheritance/driver.cxx
deleted file mode 100644
index 4592099..0000000
--- a/tests/cxx/tree/enumeration/inheritance/driver.cxx
+++ /dev/null
@@ -1,53 +0,0 @@
-// file      : tests/cxx/tree/enumeration/inheritance/driver.cxx
-// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Insert test description here.
-//
-
-#include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
-#include <iostream>
-
-#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<top_bottom> r (root (argv[1]));
-
-    switch (*r)
-    {
-    case top_bottom::top:
-      {
-        cout << "top" << endl;
-        break;
-      }
-    case top_bottom::bottom:
-      {
-        cout << "bottom" << endl;
-        break;
-      }
-    default: // Suppress warning.
-      {
-        assert (false);
-        break;
-      }
-    }
-  }
-  catch (xml_schema::exception const& e)
-  {
-    cerr << e << endl;
-    return 1;
-  }
-}
diff --git a/tests/cxx/tree/enumeration/inheritance/makefile b/tests/cxx/tree/enumeration/inheritance/makefile
deleted file mode 100644
index 716df9b..0000000
--- a/tests/cxx/tree/enumeration/inheritance/makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# file      : tests/cxx/tree/enumeration/inheritance/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
-$(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/enumeration/inheritance/output b/tests/cxx/tree/enumeration/inheritance/output
deleted file mode 100644
index fef12e2..0000000
--- a/tests/cxx/tree/enumeration/inheritance/output
+++ /dev/null
@@ -1 +0,0 @@
-bottom
diff --git a/tests/cxx/tree/enumeration/inheritance/test.xml b/tests/cxx/tree/enumeration/inheritance/test.xml
deleted file mode 100644
index 1de9043..0000000
--- a/tests/cxx/tree/enumeration/inheritance/test.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<t:root xmlns:t="test"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="test test.xsd">bottom</t:root>
diff --git a/tests/cxx/tree/enumeration/inheritance/test.xsd b/tests/cxx/tree/enumeration/inheritance/test.xsd
deleted file mode 100644
index cf2eeb1..0000000
--- a/tests/cxx/tree/enumeration/inheritance/test.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
-  <simpleType name="side">
-    <restriction base="string">
-      <enumeration value="top"/>
-      <enumeration value="left"/>
-      <enumeration value="bottom"/>
-      <enumeration value="right"/>
-    </restriction>
-  </simpleType>
-
-  <simpleType name="top-bottom">
-    <restriction base="t:side">
-      <enumeration value="top"/>
-      <enumeration value="bottom"/>
-    </restriction>
-  </simpleType>
-
-  <element name="root" type="t:top-bottom"/>
-
-</schema>
diff --git a/tests/cxx/tree/enumeration/makefile b/tests/cxx/tree/enumeration/makefile
deleted file mode 100644
index 03f31f4..0000000
--- a/tests/cxx/tree/enumeration/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# file      : tests/cxx/tree/enumeration/makefile
-# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make
-
-tests := ctor inheritance
-
-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))
-- 
cgit v1.1