Andrej Shadura pushed to branch master at Debian Java Maintainers /
puppetlabs-ring-middleware-clojure
Commits:
c8d8522c by Cyril Brulebois at 2018-12-29T16:01:20Z
Fix FTBFS by running tests in a specific order (Closes: #917600).
Instead of blindly (reverse-)sorting the results of the find command and
trusting it to be right, encode a suitable sequence of tests. Also make
sure to error out when tests are added or removed, to make sure this
sequence get refreshed when needed.
- - - - -
905fea6b by Cyril Brulebois at 2018-12-29T16:01:27Z
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,14 @@
+puppetlabs-ring-middleware-clojure (1.0.0-2) UNRELEASED; urgency=medium
+
+ * Fix FTBFS by running tests in a specific order. Instead of blindly
+ (reverse-)sorting the results of the find command and trusting it to
+ be right, encode a suitable sequence of tests (Closes: #917600). Also
+ make sure to error out when tests are added or removed, to make sure
+ this sequence get refreshed when needed.
+ * Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).
+
+ -- Cyril Brulebois <[email protected]> Sat, 29 Dec 2018 01:32:58 +0000
+
puppetlabs-ring-middleware-clojure (1.0.0-1) unstable; urgency=medium
* Initial release (Closes: #855738)
=====================================
debian/control
=====================================
@@ -25,8 +25,8 @@ Build-Depends:
libslingshot-clojure (>= 0.12.2),
default-jdk-headless
Standards-Version: 4.0.0
-Vcs-Git:
https://anonscm.debian.org/git/pkg-java/puppetlabs-ring-middleware-clojure.git
-Vcs-Browser:
https://anonscm.debian.org/cgit/pkg-java/puppetlabs-ring-middleware-clojure.git
+Vcs-Git:
https://salsa.debian.org/java-team/puppetlabs-ring-middleware-clojure.git
+Vcs-Browser:
https://salsa.debian.org/java-team/puppetlabs-ring-middleware-clojure
Homepage: https://github.com/puppetlabs/ring-middleware
Package: libpuppetlabs-ring-middleware-clojure
=====================================
debian/rules
=====================================
@@ -23,9 +23,21 @@ override_jh_clean:
rm -f $(CURDIR)/$(PRODUCED_JAR)
rm -rf $(CURDIR)/doc/html
+# Tests can't run in a random order (#917600):
+override_dh_auto_test: ORDERED_TESTS=puppetlabs/ring_middleware/utils_test.clj
puppetlabs/ring_middleware/testutils/common.clj
puppetlabs/ring_middleware/core_test.clj
+override_dh_auto_test: EXPECTED=$(shell echo "$(ORDERED_TESTS)" | sed 's/
/\n/g' | sort | xargs)
+override_dh_auto_test: FOUND=$(shell cd test && find -name '*.clj' | sed
's,^[.]/,,' | sort | xargs)
override_dh_auto_test:
- (cd test && find . -name '*.clj' | \
- xargs --verbose clojure -cp
$(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH):$(TEST_CLASSPATH))
+ # Make sure to detect when tests appear or disappear:
+ @if [ "$(FOUND)" != "$(EXPECTED)" ]; then \
+ echo "E: sanity check failed, available tests don't match known
tests:"; \
+ echo " - found: $(FOUND)"; \
+ echo " - expected: $(EXPECTED)"; \
+ echo "=> Please update ORDERED_TESTS in debian/rules
accordingly"; \
+ exit 1; \
+ fi
+ # Run tests:
+ (cd test && clojure -cp
$(CURDIR)/$(PRODUCED_JAR):$(CLASSPATH):$(TEST_CLASSPATH) $(ORDERED_TESTS))
%.html:%.md
cat debian/header.html > $@
View it on GitLab:
https://salsa.debian.org/java-team/puppetlabs-ring-middleware-clojure/compare/bad8687518933303338f7a247734605452b39a0e...905fea6b76fc85790652f8dfecbf78d029f34cc0
--
View it on GitLab:
https://salsa.debian.org/java-team/puppetlabs-ring-middleware-clojure/compare/bad8687518933303338f7a247734605452b39a0e...905fea6b76fc85790652f8dfecbf78d029f34cc0
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
