Merge branch 'feature/upstream' into develop

2 files changed, 0 insertions, 177 deletions

diff --git a/xsd/tests/cxx/parser/validation/built-in/qname/driver.cxx b/xsd/tests/cxx/parser/validation/built-in/qname/driver.cxx
deleted file mode 100644
index 3c77eea..0000000
--- a/xsd/tests/cxx/parser/validation/built-in/qname/driver.cxx
+++ /dev/null
@@ -1,106 +0,0 @@
-// file      : tests/cxx/parser/validation/built-in/qname/driver.cxx
-// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
-// license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-// Test the built-in QName type validation.
-//
-#include <cassert>
-
-#include <xsd/cxx/parser/validating/exceptions.hxx>
-#include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx>
-
-using namespace xsd::cxx::parser::validating;
-
-bool
-test_post_fail (qname_pimpl<char>& p)
-{
-  try
-  {
-    p._post ();
-  }
-  catch (invalid_value<char> const&)
-  {
-    return true;
-  }
-
-  return false;
-}
-
-int
-main ()
-{
-  typedef xsd::cxx::parser::qname<char> qname;
-
-  // Good.
-  //
-  {
-    qname_pimpl<char> p;
-    p.pre ();
-    p._pre ();
-    p._characters (" xsi");
-    p._characters (":");
-    p._characters ("schemaLocation");
-    p._post ();
-    assert (p.post_qname () == qname ("xsi", "schemaLocation"));
-  }
-
-  {
-    qname_pimpl<char> p;
-    p.pre ();
-    p._pre ();
-    p._characters ("schemaLocation");
-    p._post ();
-    assert (p.post_qname () == qname ("schemaLocation"));
-  }
-
-
-  // Bad
-  //
-  {
-    qname_pimpl<char> p;
-    p.pre ();
-    p._pre ();
-    //p._characters ("");
-    assert (test_post_fail (p));
-  }
-
-  {
-    qname_pimpl<char> p;
-    p.pre ();
-    p._pre ();
-    p._characters (":");
-    assert (test_post_fail (p));
-  }
-
-  {
-    qname_pimpl<char> p;
-    p.pre ();
-    p._pre ();
-    p._characters ("xsi:");
-    assert (test_post_fail (p));
-  }
-
-  {
-    qname_pimpl<char> p;
-    p.pre ();
-    p._pre ();
-    p._characters (":schemaLocation");
-    assert (test_post_fail (p));
-  }
-
-  {
-    qname_pimpl<char> p;
-    p.pre ();
-    p._pre ();
-    p._characters ("x?i:schemaLocation");
-    assert (test_post_fail (p));
-  }
-
-  {
-    qname_pimpl<char> p;
-    p.pre ();
-    p._pre ();
-    p._characters ("xsi:schema Location");
-    assert (test_post_fail (p));
-  }
-}
diff --git a/xsd/tests/cxx/parser/validation/built-in/qname/makefile b/xsd/tests/cxx/parser/validation/built-in/qname/makefile
deleted file mode 100644
index 9e06bad..0000000
--- a/xsd/tests/cxx/parser/validation/built-in/qname/makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# file      : tests/cxx/parser/validation/built-in/qname/makefile
-# copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC
-# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../../build/bootstrap.make
-
-cxx := driver.cxx
-
-obj := $(addprefix $(out_base)/,$(cxx:.cxx=.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)
-
-# Define XSD_CXX11 since we include libxsd headers directly.
-#
-$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
-ifeq ($(cxx_standard),c++11)
-$(obj) $(dep): cpp_options += -DXSD_CXX11
-endif
-
-$(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))
-
-# 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)