Merge branch 'feature/upstream' into develop

5 files changed, 0 insertions, 147 deletions

diff --git a/libxsd-frontend/tests/schema/union/makefile b/libxsd-frontend/tests/schema/union/makefile
deleted file mode 100644
index b0a83e3..0000000
--- a/libxsd-frontend/tests/schema/union/makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# file      : tests/schema/union/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
-
-tests := 000 001
-
-driver := $(out_root)/tests/dump/driver
-test   := $(out_base)/.test
-clean  := $(out_base)/.clean
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(driver)
-
-# Test.
-#
-test_targets := $(addprefix $(out_base)/.test-,$(tests))
-
-$(test): $(test_targets)
-$(test_targets): driver := $(driver)
-
-.PHONY: $(out_base)/.test-%
-$(out_base)/.test-%: $(driver) $(src_base)/test-%.xsd $(src_base)/test-%.std
-	$(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xsd | diff -u $(src_base)/test-$*.std -)
-
-# Clean.
-#
-$(clean):
-
-# Dependencies.
-#
-$(call import,$(src_root)/tests/dump/makefile)
diff --git a/libxsd-frontend/tests/schema/union/test-000.std b/libxsd-frontend/tests/schema/union/test-000.std
deleted file mode 100644
index 6f95b0c..0000000
--- a/libxsd-frontend/tests/schema/union/test-000.std
+++ /dev/null
@@ -1,37 +0,0 @@
-primary
-{
-  namespace test
-  {
-    union u1 http://www.w3.org/2001/XMLSchema#int http://www.w3.org/2001/XMLSchema#string 
-    union u2 
-    {
-      enumeration <anonymous>: http://www.w3.org/2001/XMLSchema#token
-      {
-        enumerator one
-      }
-    }
-
-    {
-      enumeration <anonymous>: http://www.w3.org/2001/XMLSchema#string
-      {
-        enumerator two
-      }
-    }
-
-    union u3 http://www.w3.org/2001/XMLSchema#int test#u1 
-    {
-      enumeration <anonymous>: http://www.w3.org/2001/XMLSchema#token
-      {
-        enumerator one
-      }
-    }
-
-    {
-      enumeration <anonymous>: http://www.w3.org/2001/XMLSchema#string
-      {
-        enumerator two
-      }
-    }
-
-  }
-}
diff --git a/libxsd-frontend/tests/schema/union/test-000.xsd b/libxsd-frontend/tests/schema/union/test-000.xsd
deleted file mode 100644
index 99535de..0000000
--- a/libxsd-frontend/tests/schema/union/test-000.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
-  <simpleType name="u1">
-    <union memberTypes="int string"/>
-  </simpleType>
-
-  <simpleType name="u2">
-    <union>
-      <simpleType>
-        <restriction base="token">
-          <enumeration value="one"/>
-        </restriction>
-      </simpleType>
-      <simpleType>
-        <restriction base="string">
-          <enumeration value="two"/>
-        </restriction>
-      </simpleType>
-    </union>
-  </simpleType>
-
-  <simpleType name="u3">
-    <union memberTypes="  int
-
-t:u1 ">
-      <simpleType>
-        <restriction base="token">
-          <enumeration value="one"/>
-        </restriction>
-      </simpleType>
-      <simpleType>
-        <restriction base="string">
-          <enumeration value="two"/>
-        </restriction>
-      </simpleType>
-    </union>
-  </simpleType>
-
-</schema>
diff --git a/libxsd-frontend/tests/schema/union/test-001.std b/libxsd-frontend/tests/schema/union/test-001.std
deleted file mode 100644
index f407b30..0000000
--- a/libxsd-frontend/tests/schema/union/test-001.std
+++ /dev/null
@@ -1,15 +0,0 @@
-primary
-{
-  namespace test
-  {
-    list list
-    {
-      union <anonymous> http://www.w3.org/2001/XMLSchema#int test#enum 
-    }
-    enumeration enum: http://www.w3.org/2001/XMLSchema#string
-    {
-      enumerator male
-      enumerator female
-    }
-  }
-}
diff --git a/libxsd-frontend/tests/schema/union/test-001.xsd b/libxsd-frontend/tests/schema/union/test-001.xsd
deleted file mode 100644
index 00fd8ce..0000000
--- a/libxsd-frontend/tests/schema/union/test-001.xsd
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:t="test" targetNamespace="test">
-
-  <!-- Test resolution of anonymous argument types. -->
-
-  <simpleType name="list">
-    <list>
-      <simpleType>
-        <union memberTypes="int t:enum"/>
-      </simpleType>
-    </list>
-  </simpleType>
-
-  <simpleType name="enum">
-    <restriction base="string">
-      <enumeration value="male"/>
-      <enumeration value="female"/>
-    </restriction>
-  </simpleType>
-
-</schema>