d/p/disable-check-tool-tidy.diff: Disable the call to check-tidy

diff --git a/debian/changelog b/debian/changelog
index 99966ec0e05f1b5378229a0a416a06029f5a4a33..0ab0fb8211198eb264bdedcc65583021889c1a31 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ rustc (1.15.1+dfsg1-1~exp1) experimental; urgency=medium
   * d/p/patches/disable-doc-build-in-all.diff:
     all-no-docs no longer exists. Disable the call to doc in all
   * Call to the test renamed from check-notidy => check
+  * d/p/disable-check-tool-tidy.diff:
+    Disable the call to check-tidy
   * Refresh of the patches
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 03 Feb 2017 15:34:42 +0100

diff --git a/debian/patches/disable-check-tool-tidy.diff b/debian/patches/disable-check-tool-tidy.diff
new file mode 100644 (file)
index 0000000..9d8ba0e
--- /dev/null
+++ b/debian/patches/disable-check-tool-tidy.diff
@@ -0,0 +1,21 @@
+Index: rust.git.git/src/bootstrap/step.rs
+===================================================================
+--- rust.git.git.orig/src/bootstrap/step.rs
++++ rust.git.git/src/bootstrap/step.rs
+@@ -379,11 +379,11 @@ pub fn build_rules(build: &Build) -> Rul
+          .dep(|s| s.name("librustc"))
+          .host(true)
+          .run(move |s| check::cargotest(build, s.stage, s.target));
+-    rules.test("check-tidy", "src/tools/tidy")
+-         .dep(|s| s.name("tool-tidy").stage(0))
+-         .default(true)
+-         .host(true)
+-         .run(move |s| check::tidy(build, 0, s.target));
++//    rules.test("check-tidy", "src/tools/tidy")
++//         .dep(|s| s.name("tool-tidy").stage(0))
++//         .default(true)
++//         .host(true)
++//         .run(move |s| check::tidy(build, 0, s.target));
+     rules.test("check-error-index", "src/tools/error_index_generator")
+          .dep(|s| s.name("libstd"))
+          .dep(|s| s.name("tool-error-index").host(s.host))

diff --git a/debian/patches/series b/debian/patches/series
index 80f44e25175de302821214ed65160ce4547518e5..928d97324697deb4561bb3ea1ccf4aac88043884 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,4 +18,4 @@ d-fix-configure-for-deb-arches.patch
 d-dynamic-link-llvm.patch
 d-use-system-jquery.patch
 d-fill-in-mips-mk-rules.patch
-d-disable-doc-build-in-all.diff
+disable-check-tool-tidy.diff