Tweak test failure rules

diff --git a/debian/changelog b/debian/changelog
index cc4ae3cc74a0ee92388911225f22a5ed39bebcdc..a957d780c3f24e408383c750c1e41face5d514a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rustc (1.30.0~beta.7+dfsg1-1~exp2) UNRELEASED; urgency=medium
+
+  * Tweak test failure rules: armel <= 8, ppc64 <= 12.
+
+ -- Ximin Luo <infinity0@debian.org>  Mon, 24 Sep 2018 08:35:31 -0700
+
 rustc (1.30.0~beta.7+dfsg1-1~exp1) experimental; urgency=medium
 
   * New upstream release.

diff --git a/debian/rules b/debian/rules
index 9d19a3a6afa3599dde3c3786fa35abdd801e3c2c..0e150239fc742aef4c490ad3fd6e76f8a61c9502 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -209,8 +209,8 @@ TEST_LOG = debian/rustc-tests.log
 # This is advertised as "5 tests failed" in README.Debian because our counting
 # method is imprecise and in practise we count some failures twice.
 FAILURES_ALLOWED = 8
-ifneq (,$(filter $(DEB_BUILD_ARCH), armel))
-  FAILURES_ALLOWED = 36
+ifneq (,$(filter $(DEB_BUILD_ARCH), ppc64))
+  FAILURES_ALLOWED = 12
 endif
 ifneq (,$(filter $(DEB_BUILD_ARCH), s390x))
   FAILURES_ALLOWED = 25
@@ -240,7 +240,7 @@ ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
        echo -n "$(FAILURES_ALLOWED) maximum allowed. "; \
        if test "$$num_failures" -eq 0 -a "$$exit_code" -ne 0; then \
          echo "Aborting just in case, because we missed counting some test failures."; \
-         echo "This is a bug in the Debian packaging, please file a report. "; \
+         echo "This could happen if we failed to build the tests, or if the testsuite runner is buggy."; \
          false; \
        elif test "$$num_failures" -le $(FAILURES_ALLOWED); then \
          echo "Continuing..."; \