Merge version 1.32.0+dfsg1-1+rpi1 and 1.32.0+dfsg1-3 to produce 1.32.0+dfsg1-3+rpi1

diff --cc debian/changelog
index 28cf46347fb17dd3f4428dbf26f3780c4e342e92,55a6827b79c5bccfaaa573a8329ad0575aef32e2..479d44ceac72070c3f9294b6f605b3207cf89fa0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,16 +1,25 @@@
- rustc (1.32.0+dfsg1-1+rpi1) buster-staging; urgency=medium
++rustc (1.32.0+dfsg1-3+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 04 Feb 2019 05:20:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 08 Apr 2019 01:32:43 +0000
++
+ rustc (1.32.0+dfsg1-3) unstable; urgency=medium
+ 
+   * Conditionally-apply u-compiletest.patch based on stage0 compiler.
+   * Fix syntax error in d/rules compiletest check.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 17 Mar 2019 16:40:05 -0700
+ 
+ rustc (1.32.0+dfsg1-2) unstable; urgency=medium
+ 
+   * More verbose logging during builds.
+   * Fix compiletest compile error, and check log has at least 1 pass.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 17 Mar 2019 12:52:57 -0700
  
  rustc (1.32.0+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/rules
index 1ab575aea35993662db1e5f3d3d586c7dd2a2796,8106358d588782f4e7f82bf5358d241549671590..380b7d50ccede715e1e37b93dbc27580e1b0ebf9
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -230,9 -237,10 +237,10 @@@ override_dh_auto_test-arch
                test "$$(stat -c %s "$$x")" -lt 6000000; \
        done
  ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES)))
 -ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
 +ifeq (testsuitedisabled, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
        { $(RUSTBUILD_TEST) --no-fail-fast $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS); echo $$?; } | tee -a $(TEST_LOG)
-       test -f $(TEST_LOG)
+       # test that the log has at least 1 pass, to prevent e.g. #57709
+       grep -l "^test .* \.\.\. ok$$" $(TEST_LOG)
        echo "==== Debian rustc test report ===="; \
        echo "Specific test failures:"; \
        $(FAILED_TESTS); \