[Git][java-team/libnanoxml2-java][master] 2 commits: More verbose output in build time test

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Java Maintainers / libnanoxml2-java


Commits:
3932de76 by Andreas Tille at 2018-05-07T14:18:27+02:00
More verbose output in build time test

- - - - -
d04f4558 by Andreas Tille at 2018-05-07T14:19:43+02:00
Point Vcs-fields to Salsa

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 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:
     - change -source arguments
     - rename all the "enum" variables to "enu"
 
+  [ Andreas Tille ]
+  * More verbose output in build time test
+  * Point Vcs-fields to Salsa
+
  -- Chris West (Faux) <debian at fau.xxx>  Fri, 08 Sep 2017 13:16:03 +0100
 
 libnanoxml2-java (2.2.3.dfsg-5) unstable; urgency=medium


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends-Indep: default-jdk-doc,
                      perl,
                      javahelper
 Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libnanoxml2-java.git
-Vcs-Git: git://anonscm.debian.org/pkg-java/libnanoxml2-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libnanoxml2-java
+Vcs-Git: https://salsa.debian.org/java-team/libnanoxml2-java.git
 Homepage: http://devkix.com/nanoxml.php
 
 Package: libnanoxml2-java


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -53,10 +53,12 @@ override_dh_clean:
 
 test:
 	set -e
+	set -x
 	cd Test/Lite && \
 	${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${LITE} `find -iname *.java` && \
-	for TESTFILE in *.xml; \
-		do if [ "`${JAVA_HOME}/bin/java -cp .:../../${LITE} DumpXML_Lite $${TESTFILE}`" != "`cat $${TESTFILE}.out`" ]; \
+	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 ; \
 		then	echo ${LITE} failed $${TESTFILE}; \
 			exit 1; \
 		fi; \
@@ -64,8 +66,9 @@ test:
 
 	cd Test/Java && \
 	${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${NANOXML} `find -iname *.java` && \
-	for TESTFILE in *.xml; \
-		do if [ "`${JAVA_HOME}/bin/java -cp .:../../${NANOXML} DumpXML $${TESTFILE}`" != "`cat $${TESTFILE}.out`" ] ;\
+	for TESTFILE in *.xml; do\
+		${JAVA_HOME}/bin/java -cp .:../../${NANOXML} DumpXML $${TESTFILE} > $${TESTFILE}.test_out ; \
+		if diff -u $${TESTFILE}.out $${TESTFILE}.test_out ; \
 		then	echo ${NANOXML} failed $${TESTFILE}; \
 			exit 1; \
 		fi; \



View it on GitLab: https://salsa.debian.org/java-team/libnanoxml2-java/compare/4638f355a554711ffc9fc58548c5ee9466b984e2...d04f455849387363e7937acdb160614ae7e3c4c4

---
View it on GitLab: https://salsa.debian.org/java-team/libnanoxml2-java/compare/4638f355a554711ffc9fc58548c5ee9466b984e2...d04f455849387363e7937acdb160614ae7e3c4c4
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/20180507/b2716310/attachment.html>