Tony Mancill pushed to branch master at Debian Java Maintainers / ant-contrib
Commits: 278aafe0 by tony mancill at 2018-09-03T15:48:54Z Add outofdate-test.patch to address FTBFS (Closes: #907763) - - - - - 011b0c0e by tony mancill at 2018-09-03T15:48:59Z Update Vcs URLs to point to Salsa - - - - - f47b1749 by tony mancill at 2018-09-03T15:48:59Z Bump Standards-Version to 4.2.1 - - - - - 7e1d9f40 by tony mancill at 2018-09-03T15:48:59Z Freshen debian/copyright - - - - - 1ffb8fec by tony mancill at 2018-09-03T15:48:59Z Use debhelper 11 - - - - - cb2dc29b by tony mancill at 2018-09-03T15:55:12Z Update Section in debian/control from extra -> optional - - - - - 7a675118 by tony mancill at 2018-09-03T15:55:12Z prepare changelog for upload - - - - - 6 changed files: - debian/changelog - debian/compat - debian/control - debian/copyright - + debian/patches/0005-outofdate-test.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,15 @@ +ant-contrib (1.0~b3+svn177-10) unstable; urgency=medium + + * Team upload. + * Add outofdate-test.patch to address FTBFS (Closes: #907763) + * Update Vcs URLs to point to Salsa + * Bump Standards-Version to 4.2.1 + * Freshen debian/copyright + * Use debhelper 11 + * Update Section in debian/control from extra -> optional + + -- tony mancill <[email protected]> Mon, 03 Sep 2018 08:54:13 -0700 + ant-contrib (1.0~b3+svn177-9) unstable; urgency=medium * Team upload. ===================================== debian/compat ===================================== @@ -1 +1 @@ -9 +11 ===================================== debian/control ===================================== @@ -1,9 +1,9 @@ Source: ant-contrib Section: java -Priority: extra +Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: James Page <[email protected]> -Build-Depends: ant, debhelper (>= 9), default-jdk +Build-Depends: ant, debhelper (>= 11), default-jdk Build-Depends-Indep: ant-optional, ivy (>= 2), junit, @@ -11,9 +11,9 @@ Build-Depends-Indep: ant-optional, libcommons-httpclient-java, libxerces2-java, maven-repo-helper -Standards-Version: 3.9.8 -Vcs-Git: https://anonscm.debian.org/git/pkg-java/ant-contrib.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/ant-contrib.git +Standards-Version: 4.2.1 +Vcs-Git: https://salsa.debian.org/java-team/ant-contrib.git +Vcs-Browser: https://salsa.debian.org/java-team/ant-contrib Homepage: http://ant-contrib.sourceforge.net Package: ant-contrib ===================================== debian/copyright ===================================== @@ -14,6 +14,7 @@ Copyright: 2009, Daniel Leidert <[email protected]> 2011, Torsten Werner <[email protected]> 2012, Damien Raude-Morvan <[email protected]> 2014-2016, Emmanuel Bourg <[email protected]> + 2018, tony mancill <[email protected]> License: Apache-2.0 License: Apache-2.0 ===================================== debian/patches/0005-outofdate-test.patch ===================================== @@ -0,0 +1,73 @@ +Description: address intermittent test failures + Update "outofdate" test case to ensure that the simulated build artifacts + (outofdate/gen/*) have dates strictly later than the source files. + . + It appears that the tests were failure due to a race where "file.done" + was considered out of date and thus appeared in the source set, despite + being configured as up to date in the test case. + . + That said, it's not clear to me how it ever worked in the first place + given the logic in OutOfData.outOfDate(): + . + if ((!ret) && (sourceFile != null)) { + ret = sourceFile.lastModified() > targetFile.lastModified(); + } + . + My assumption is that the test was previously broken/flaky, but that time + was chunkier (larger quanta) until recently and so the source files had + the same timestamp and so weren't strictly newer. + . + This patch also adds the fork=true attribute to the junit task, which + resolves spurious test failures observed after the OutOfDate test was + patched. +Author: tony mancill <[email protected]> +Origin: vendor +Bug-Debian: https://bugs.debian.org/907763 +Forwarded: no +Last-Update: 2018-09-03 + +--- a/test/resources/logic/outofdate.xml ++++ b/test/resources/logic/outofdate.xml +@@ -92,14 +92,6 @@ + </target> + + <target name="outofdate.init"> +- <!-- generated --> +- <mkdir dir="outofdate/gen/1/2/3"/> +- <touch file="outofdate/gen/index.done"/> +- <touch file="outofdate/gen/1/2/file.done"/> +- <touch file="outofdate/gen/1/done.c"/> +- <touch file="outofdate/gen/1/done.h"/> +- <touch file="outofdate/gen/1/partial.c"/> +- + <!-- sources --> + <mkdir dir="outofdate/source/1/2/3"/> + <touch file="outofdate/source/newer.text"/> +@@ -108,6 +100,16 @@ + <touch file="outofdate/source/1/done.y"/> + <touch file="outofdate/source/1/partial.y"/> + ++ <!-- guarantee that some time has elapsed --> ++ <sleep milliseconds="1"/> ++ ++ <!-- generated --> ++ <mkdir dir="outofdate/gen/1/2/3"/> ++ <touch file="outofdate/gen/index.done"/> ++ <touch file="outofdate/gen/1/2/file.done"/> ++ <touch file="outofdate/gen/1/done.c"/> ++ <touch file="outofdate/gen/1/done.h"/> ++ <touch file="outofdate/gen/1/partial.c"/> + </target> + + <target name="outofdate.test" depends="outofdate.init"> +--- a/build.xml ++++ b/build.xml +@@ -279,7 +279,7 @@ + <path refid="test.classpath" /> + </pathconvert> + +- <junit haltonfailure="false" haltonerror="false" ++ <junit fork="true" haltonfailure="false" haltonerror="false" + errorproperty="junit.error" failureproperty="junit.failure"> + <formatter type="brief" usefile="false"/> + <batchtest> ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ 0002-Ensure-for-task-is-specified-correctly.patch 0003-ivy-compatibility.patch 0004-optional-maven-dependencies.patch +0005-outofdate-test.patch View it on GitLab: https://salsa.debian.org/java-team/ant-contrib/compare/52d2910cb6220b4d9c68d440e9958e7310303e55...7a67511847f39c47a5aae4e96ca566fe410b4638 -- View it on GitLab: https://salsa.debian.org/java-team/ant-contrib/compare/52d2910cb6220b4d9c68d440e9958e7310303e55...7a67511847f39c47a5aae4e96ca566fe410b4638 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
