[Git][java-team/libnanoxml2-java][master] 5 commits: Revert "Set Maintainer to pkg-java-maintainers at alioth-lists.debian.net"
Emmanuel Bourg
gitlab at salsa.debian.org
Sat May 12 00:59:15 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libnanoxml2-java
Commits:
2942be63 by Emmanuel Bourg at 2018-05-10T00:30:34+02:00
Revert "Set Maintainer to pkg-java-maintainers at alioth-lists.debian.net"
This reverts commit 835d7fc9cdf704b1a18ed6062b70373910273fda.
- - - - -
c6573e75 by Thorsten Glaser at 2018-05-12T01:36:03+02:00
Fixed the test target
- - - - -
5fa8fb39 by Emmanuel Bourg at 2018-05-12T01:57:18+02:00
Fixed the test cases
- - - - -
c37dbf0f by Emmanuel Bourg at 2018-05-12T01:57:29+02:00
Marked bug #893268 as fixed
- - - - -
7d3418b8 by Emmanuel Bourg at 2018-05-12T01:57:29+02:00
Clean the test output files
- - - - -
6 changed files:
- debian/changelog
- + debian/clean
- debian/control
- + debian/patches/02-fix-tests.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ libnanoxml2-java (2.2.3.dfsg-6) UNRELEASED; urgency=medium
* Team upload
[ Chris West (Faux) ]
- * Update to -source 1.8 to allow build with Java 9:
+ * Update to -source 1.8 to allow build with Java 9 (Closes: #893268)
- change -source arguments
- rename all the "enum" variables to "enu"
@@ -12,7 +12,9 @@ libnanoxml2-java (2.2.3.dfsg-6) UNRELEASED; urgency=medium
* Point Vcs-fields to Salsa
* Standards-Version: 4.1.4
* debhelper 11
- * Set Maintainer to pkg-java-maintainers at alioth-lists.debian.net
+
+ [ Emmanuel Bourg ]
+ * Fixed the test cases
-- Chris West (Faux) <debian at fau.xxx> Fri, 08 Sep 2017 13:16:03 +0100
=====================================
debian/clean
=====================================
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+Test/Lite/*.test_out
+Test/Java/*.test_out
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: libnanoxml2-java
-Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>
Section: java
Priority: optional
=====================================
debian/patches/02-fix-tests.patch
=====================================
--- /dev/null
+++ b/debian/patches/02-fix-tests.patch
@@ -0,0 +1,23 @@
+--- a/Test/Java/double_dtd.xml.out
++++ b/Test/Java/double_dtd.xml.out
+@@ -1 +1 @@
+-<FOO x="1" z="defaultValue" y="fixedValue">blah</FOO>
+\ No newline at end of file
++<FOO x="1" y="fixedValue" z="defaultValue">blah</FOO>
+--- a/Test/Java/external_dtd.xml.out
++++ b/Test/Java/external_dtd.xml.out
+@@ -1,2 +1,2 @@
+-<FOO x="1" z="defaultValue" y="fixedValue">INCLUDE
+-</FOO>
+\ No newline at end of file
++<FOO x="1" y="fixedValue" z="defaultValue">INCLUDE
++</FOO>
+--- a/Test/Java/internal_dtd.xml.out
++++ b/Test/Java/internal_dtd.xml.out
+@@ -1,3 +1,3 @@
+-<FOO x="1" z="defaultValue" y="fixedValue">INCLUDE
++<FOO x="1" y="fixedValue" z="defaultValue">INCLUDE
+ 	
+-

</FOO>
+\ No newline at end of file
++

</FOO>
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-fix-java9-build.patch
+02-fix-tests.patch
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -37,10 +37,11 @@ override_dh_auto_build:
nanoxml net.n3.nanoxml net.n3.nanoxml.sax -d api
override_dh_auto_test:
- if [ $(filter nocheck, $(DEB_BUILD_OPTIONS)) ]; \
- then echo "Disabeling tests"; \
- else make -f debian/rules test; \
- fi;
+ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
+ make -f debian/rules test
+else
+ echo "Disabling tests"
+endif
override_dh_clean:
jh_clean
@@ -52,23 +53,22 @@ override_dh_clean:
dh_clean
test:
- set -e
- set -x
+ set -e; \
+ set -x; \
cd Test/Lite && \
${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${LITE} `find -iname *.java` && \
for TESTFILE in *.xml; do \
${JAVA_HOME}/bin/java -cp .:../../${LITE} DumpXML_Lite $${TESTFILE} > $${TESTFILE}.test_out ; \
- if diff -u $${TESTFILE}.out $${TESTFILE}.test_out ; \
+ if ! diff -u -w $${TESTFILE}.out $${TESTFILE}.test_out ; \
then echo ${LITE} failed $${TESTFILE}; \
exit 1; \
fi; \
- done
-
- cd Test/Java && \
- ${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${NANOXML} `find -iname *.java` && \
+ done; \
+ cd ../Java && \
+ ${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${NANOXML} $$(find -iname *.java) && \
for TESTFILE in *.xml; do\
${JAVA_HOME}/bin/java -cp .:../../${NANOXML} DumpXML $${TESTFILE} > $${TESTFILE}.test_out ; \
- if diff -u $${TESTFILE}.out $${TESTFILE}.test_out ; \
+ if ! diff -u -w $${TESTFILE}.out $${TESTFILE}.test_out ; \
then echo ${NANOXML} failed $${TESTFILE}; \
exit 1; \
fi; \
@@ -76,5 +76,5 @@ test:
touch $@
get-orig-source:
- set -e
+ set -e; \
sh ${SRCDIR}/debian/origCleaner.sh thisIsIgnored ${VERSION} alsoIgnored ${SRCDIR}/debian/orig.tmp
View it on GitLab: https://salsa.debian.org/java-team/libnanoxml2-java/compare/835d7fc9cdf704b1a18ed6062b70373910273fda...7d3418b84eef25dcddc3cd864aa8365353da5ff8
---
View it on GitLab: https://salsa.debian.org/java-team/libnanoxml2-java/compare/835d7fc9cdf704b1a18ed6062b70373910273fda...7d3418b84eef25dcddc3cd864aa8365353da5ff8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180511/2103b96b/attachment.html>
More information about the pkg-java-commits
mailing list