[Git][java-team/ring-clojure][master] 2 commits: Sort filenames for tests found using find (Closes: #918437).

[Cyril Brulebois]

Cyril Brulebois pushed to branch master at Debian Java Maintainers / ring-clojure


Commits:
c25318a8 by Cyril Brulebois at 2019-02-08T12:33:20Z
Sort filenames for tests found using find (Closes: #918437).

This ensures reproducible lists of test files, as order matters for
successful test runs. This fixes the intermittent FTBFS due to test
failures.

- - - - -
6c90be25 by Cyril Brulebois at 2019-02-08T12:56:43Z
Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+ring-clojure (1.6.2-2) UNRELEASED; urgency=medium
+
+  * Sort filenames for tests found using find, to ensure reproducible
+    lists of test files, as order matters for successful test runs. This
+    fixes the intermittent FTBFS due to test failures (Closes: #918437).
+  * Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).
+
+ -- Cyril Brulebois <kibi at debian.org>  Fri, 08 Feb 2019 12:31:29 +0000
+
 ring-clojure (1.6.2-1) unstable; urgency=medium
 
   * Initial release (Closes: #855749)


=====================================
debian/control
=====================================
@@ -18,8 +18,8 @@ Build-Depends: clojure (>= 1.8),
                markdown,
                maven-repo-helper (>= 1.5~)
 Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/ring-clojure.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/ring-clojure.git
+Vcs-Git: https://salsa.debian.org/java-team/ring-clojure.git
+Vcs-Browser: https://salsa.debian.org/java-team/ring-clojure
 Homepage: https://github.com/ring-clojure/ring
 
 Package: libring-core-clojure


=====================================
debian/rules
=====================================
@@ -14,12 +14,15 @@ override_jh_build:
 	jar cf ring-servlet.jar -C ring-servlet/src .
 	jar cf ring-jetty-adapter.jar -C ring-jetty-adapter/src .
 
+# Sorting the filenames according to the C locale is sufficient to get a
+# successful run as of 1.6.2 but further updates might need to encode a
+# specific sequence instead (#918437):
 override_dh_auto_test:
-	find ring-core/test -name '*.clj' | \
+	find ring-core/test -name '*.clj' | LC_ALL=C sort | \
 		xargs --verbose clojure -cp ring-core.jar:$(CORE_CLASSPATH)
-	find ring-servlet/test -name '*.clj' | \
+	find ring-servlet/test -name '*.clj' | LC_ALL=C sort | \
 		xargs --verbose clojure -cp ring-servlet.jar:ring-core.jar:$(SERVLET_CLASSPATH)
-	find ring-jetty-adapter/test -name '*.clj' | \
+	find ring-jetty-adapter/test -name '*.clj' | LC_ALL=C sort | \
 		xargs --verbose clojure -cp ring-jetty-adapter.jar:ring-servlet.jar:ring-core.jar:$(SERVLET_CLASSPATH):$(JETTY_CLASSPATH):/usr/share/java/clj-http.jar:/usr/share/java/commons-logging.jar
 
 override_jh_clean:



View it on GitLab: https://salsa.debian.org/java-team/ring-clojure/compare/7425ae6a43c57072b4c711546d0ba8693f2f80dc...6c90be250c06297a61ce4883e77f9be9d33a8bcd

-- 
View it on GitLab: https://salsa.debian.org/java-team/ring-clojure/compare/7425ae6a43c57072b4c711546d0ba8693f2f80dc...6c90be250c06297a61ce4883e77f9be9d33a8bcd
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/20190208/19029b26/attachment.html>