Bug#893268: libjbzip2-java now in Java team, libnanoxml2-java remains buggy (Was: Bug#893268: Intend to take over libjbzip2-java and libnanoxml2-java into Debian Med team)
Hi, On Sat, May 12, 2018 at 01:59:42AM +0200, Emmanuel Bourg wrote: > > You summoned? > > Thank you for the quick help! It works perfectly. > > @Andreas: I pushed the fixes, could you complete the upload please? Done. BTW, I did the team hijack to enable every team member to upload. While its fine for me to do this its also perfectly welcome if you upload any of the packages that are mentioning myself as Uploader (which was not even the case here) without asking. :-) Kind regards Andreas. -- http://fam-tille.de
Bug#893268: libjbzip2-java now in Java team, libnanoxml2-java remains buggy (Was: Bug#893268: Intend to take over libjbzip2-java and libnanoxml2-java into Debian Med team)
Le 10/05/2018 à 05:52, Thorsten Glaser a écrit : > You summoned? Thank you for the quick help! It works perfectly. @Andreas: I pushed the fixes, could you complete the upload please?
Bug#893268: libjbzip2-java now in Java team, libnanoxml2-java remains buggy (Was: Bug#893268: Intend to take over libjbzip2-java and libnanoxml2-java into Debian Med team)
On Thu, 10 May 2018, Emmanuel Bourg wrote:
> need some help from a make/shell expert.
You summoned?
Try this (untested):
diff --git a/debian/rules b/debian/rules
index 19037e6..6458af2 100755
--- 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)) ]; \
- thenecho "Disabeling tests"; \
- elsemake -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` && \
+ ${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 $${TESTFILE}.out $${TESTFILE}.test_out ; \
thenecho ${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 $${TESTFILE}.out $${TESTFILE}.test_out ; \
thenecho ${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
Summary of changes:
• don’t confuse make variables with shell checks
• make rule lines are run sequentially; if you want them
to affect the next line you have to combine them
• `…` is obsolete since 1988 or so, even in POSIX
• if COMMAND; then …; fi ← runs if COMMAND exits 0 (successfully),
you want to check for deviations (failure to compare)
Meow,
//mirabilos
--
«MyISAM tables -will- get corrupted eventually. This is a fact of life. »
“mysql is about as much database as ms access” – “MSSQL at least descends
from a database” “it's a rebranded SyBase” “MySQL however was born from a
flatfile and went downhill from there” – “at least jetDB doesn’t claim to
be a database” ‣‣‣ Please, http://deb.li/mysql and MariaDB, finally die!
Bug#893268: libjbzip2-java now in Java team, libnanoxml2-java remains buggy (Was: Bug#893268: Intend to take over libjbzip2-java and libnanoxml2-java into Debian Med team)
Le 07/05/2018 à 15:00, Andreas Tille a écrit : > libjbzip2-java is now in java-team[1] as promised. Unfortunately bug > #893268 of libnanoxml2-java[2] is not yet solved. Can someone from > Java team please have a look? I got a look and I don't understand why it fails. The test script is probably broken, it checks if files are equal... but fails on equal files. I tried replacing "diff -u" with "cmp" but that didn't help. We need some help from a make/shell expert. Emmanuel Bourg
Bug#893268: libjbzip2-java now in Java team, libnanoxml2-java remains buggy (Was: Bug#893268: Intend to take over libjbzip2-java and libnanoxml2-java into Debian Med team)
Hi, libjbzip2-java is now in java-team[1] as promised. Unfortunately bug #893268 of libnanoxml2-java[2] is not yet solved. Can someone from Java team please have a look? Kind regards Andreas. [1] https://salsa.debian.org/java-team/libjbzip2-java [2] https://salsa.debian.org/java-team/libnanoxml2-java On Sun, Mar 25, 2018 at 11:59:14PM +0200, Emmanuel Bourg wrote: > Le 25/03/2018 à 23:29, Andreas Tille a écrit : > > > I'm fine with moving libjbzip2-java (which I uploaded today) once > > pkg-java has moved to Salsa (or did I missed the move?) > > I'm working on the migration, I haven't finalized the notification hooks > yet. > -- http://fam-tille.de
