[xsom] 01/01: disable tests, there doesn't seem to be another way to get around the nonfree stuff

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository xsom.

commit 2c3e3546f423143428a8f38fc61967bf598ff63f
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Tue Jun 17 18:08:56 2014 +0300

    disable tests, there doesn't seem to be another way to get around the nonfree stuff
---
 debian/patches/01-disable-license-ant-task.patch |  4 ++--
 debian/patches/02-disable-tests.patch            | 25 ++++++++++++++++++++++++
 debian/patches/02-use-local-schemas.patch        | 23 ----------------------
 debian/patches/series                            |  3 ++-
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/debian/patches/01-disable-license-ant-task.patch b/debian/patches/01-disable-license-ant-task.patch
index 4d8f890..f0b1ed2 100644
--- a/debian/patches/01-disable-license-ant-task.patch
+++ b/debian/patches/01-disable-license-ant-task.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
      <licenses>
          <license>
              <name>CDDL v1.1 / GPL v2 dual license</name>
-@@ -146,12 +141,6 @@
+@@ -146,12 +143,6 @@
                          <phase>generate-sources</phase>
                          <configuration>
                              <tasks>
@@ -28,7 +28,7 @@ Forwarded: not-needed
                                  <mkdir dir="build/automata" />
  
                                  <!-- delete old files to avoid corruption -->
-@@ -164,9 +153,6 @@
+@@ -164,9 +155,6 @@
                                      <arg path="build/src/com/sun/xml/xsom/impl/parser/state" />
                                      <arg path="src/xmlschema.rng" />
                                  </java>
diff --git a/debian/patches/02-disable-tests.patch b/debian/patches/02-disable-tests.patch
new file mode 100644
index 0000000..797e0c4
--- /dev/null
+++ b/debian/patches/02-disable-tests.patch
@@ -0,0 +1,25 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -96,7 +96,6 @@
+     </dependencies>
+     <build>
+         <sourceDirectory>src</sourceDirectory>
+-        <testSourceDirectory>test</testSourceDirectory>
+         <resources>
+             <resource>
+                 <directory>src</directory>
+@@ -105,14 +104,6 @@
+                 </excludes>
+             </resource>
+         </resources>
+-        <testResources>
+-            <testResource>
+-                <directory>test</directory>
+-                <excludes>
+-                    <exclude>**/*.java</exclude>
+-                </excludes>
+-            </testResource>
+-        </testResources>
+         <plugins>
+             <plugin>
+                 <groupId>org.codehaus.mojo</groupId>
diff --git a/debian/patches/02-use-local-schemas.patch b/debian/patches/02-use-local-schemas.patch
deleted file mode 100644
index b768584..0000000
--- a/debian/patches/02-use-local-schemas.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Use a local XML schema to avoid fetching an external resource from the network during the build
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/test/XSOMParserTest.java
-+++ b/test/XSOMParserTest.java
-@@ -60,7 +60,7 @@
-  */
- public class XSOMParserTest extends TestCase {
- 
--    private static String docURLStr = "http://docs.oasis-open.org/regrep/v3.0/schema/lcm.xsd";
-+    private static String docURLStr = "debian/local/lcm.xsd";
-     //private static String docURLStr = "http://ebxmlrr.sourceforge.net/private/sun/irs/ContactMechanism/IRS-ContactMechanismCommonAggregateComponents-1.0.xsd";
-     private static URL docURL = null;
-     private static XSOMParser instance = null;
-@@ -71,7 +71,7 @@
- 
-     protected void setUp() throws Exception {
-         if (docURL == null) {
--            docURL = new URL(docURLStr);
-+            docURL = new java.io.File(docURLStr).toURI().toURL();
- 
-             instance = new XSOMParser();
-         }
diff --git a/debian/patches/series b/debian/patches/series
index 2fa906e..5b6b8ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-disable-license-ant-task.patch
-02-use-local-schemas.patch
+#02-disable-xsomparsertest.diff
+02-disable-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xsom.git