Author: gio Date: 2011-08-21 09:17:44 +0000 (Sun, 21 Aug 2011) New Revision: 14365
Modified: trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch trunk/libwoodstox-java/debian/patches/series trunk/libwoodstox-java/debian/rules Log: Tests enabled again, at the terrible price that the package doesn't compile. :-( Modified: trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch =================================================================== --- trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch 2011-08-21 08:59:38 UTC (rev 14364) +++ trunk/libwoodstox-java/debian/patches/20-testsuite-enable.dpatch 2011-08-21 09:17:44 UTC (rev 14365) @@ -1,41 +1,50 @@ From: Thierry Carrez <[email protected]> Subject: Enable test suite +Last-Update: 2011-08-21 +Forwarded: not-needed * Enable test suite, make it block the build in case of failure * Disable tests relying on non-packages external libs -diff -urNad libwoodstox-java-3.9.2.dfsg~/build.xml libwoodstox-java-3.9.2.dfsg/build.xml ---- libwoodstox-java-3.9.2.dfsg~/build.xml 2009-12-18 16:18:18.529774667 +0100 -+++ libwoodstox-java-3.9.2.dfsg/build.xml 2009-12-18 16:18:41.899793876 +0100 -@@ -577,10 +577,12 @@ - debug="true" - > +Index: libwoodstox-java/build.xml +=================================================================== +--- libwoodstox-java.orig/build.xml 2011-08-21 11:00:48.000000000 +0200 ++++ libwoodstox-java/build.xml 2011-08-21 11:14:37.000000000 +0200 +@@ -476,7 +476,6 @@ + <pathelement path="${dir.build.classes.woodstox}" /> + <pathelement path="${dir.build.classes.stax2}" /> + <pathelement location="${dir.classes.test}" /> +- <path refid="junit-libs"/> + </classpath> + </junit> + </target> +@@ -494,9 +493,7 @@ <include name="**/*.java" /> -+ <exclude name="**/TestRelaxNG.java" /> -+ <exclude name="**/TestW3CSchema.java" /> - <classpath refid="compile-classpath" /> + <classpath refid="classpath.compile" /> <classpath> - <pathelement path="${BuildClassesDir}"/> +- <pathelement path="${dir.build.classes.stax2}"/> + <pathelement path="${dir.build.classes.woodstox}"/> - <path refid="junit-libs"/> -+ <!--path refid="junit-libs"/--> </classpath> </javac> - </target> -@@ -589,7 +591,7 @@ - <target name="test" depends="test.compile"> + <!-- 08-Jun-2009, tatu: need to copy some test files too --> +@@ -511,7 +508,7 @@ + <target name="test" depends="compile.test"> <!-- showoutput 'yes' to allow outputting debug msgs... --> <junit fork="yes" forkmode="once" maxmemory="128M" - printsummary="yes" haltonfailure="no" showoutput="yes"> + printsummary="yes" haltonfailure="yes" showoutput="yes"> - <batchtest fork="yes" todir="${TestXmlResultsDir}"> - <fileset dir="${TestClassesDir}"> + <batchtest fork="yes" todir="${dir.test.xmlresults}"> + <fileset dir="${dir.classes.test}"> <!-- Need to exclude inner classes... --> -@@ -602,7 +604,7 @@ +@@ -522,10 +519,8 @@ + <formatter type="xml" /> + <classpath refid="classpath.compile" /> <classpath> - <pathelement path="${BuildClassesDir}" /> - <pathelement location="${TestClassesDir}" /> +- <pathelement path="${dir.build.classes.stax2}" /> + <pathelement path="${dir.build.classes.woodstox}" /> + <pathelement location="${dir.classes.test}" /> - <path refid="junit-libs"/> -+ <!--path refid="junit-libs"/--> </classpath> </junit> Modified: trunk/libwoodstox-java/debian/patches/series =================================================================== --- trunk/libwoodstox-java/debian/patches/series 2011-08-21 08:59:38 UTC (rev 14364) +++ trunk/libwoodstox-java/debian/patches/series 2011-08-21 09:17:44 UTC (rev 14365) @@ -1,2 +1,2 @@ 10-fix-build.xml -#20-testsuite-enable.dpatch +20-testsuite-enable.dpatch Modified: trunk/libwoodstox-java/debian/rules =================================================================== --- trunk/libwoodstox-java/debian/rules 2011-08-21 08:59:38 UTC (rev 14364) +++ trunk/libwoodstox-java/debian/rules 2011-08-21 09:17:44 UTC (rev 14365) @@ -6,11 +6,12 @@ JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant DEB_ANT_COMPILER := modern +DEB_JARS := ant-nodeps junit ant-junit ant-trax DEB_ANT_BUILD_TARGET := debiandist DEB_BUILDDIR := . DEB_ANT_BUILDFILE := build.xml DEB_ANT_CLEAN_TARGET := clean -#DEB_ANT_CHECK_TARGET := test +DEB_ANT_CHECK_TARGET := test clean:: -rm -Rf build doc test dist woodstox-core-lgpl.patched.pom _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
