ci: split distcheck job on azure

Author: pietroalbini

.azure-pipelines/auto.yml

@@ -171,8 +171,12 @@ jobs:
       x86_64-gnu-nopt:
         IMAGE: x86_64-gnu-nopt
 
-      x86_64-gnu-distcheck:
+      x86_64-gnu-distcheck-1:
         IMAGE: x86_64-gnu-distcheck
+        SCRIPT: ./x.py test distcheck --distcheck-make ci-subset-1
+      x86_64-gnu-distcheck-2:
+        IMAGE: x86_64-gnu-distcheck
+        SCRIPT: ./x.py test distcheck --distcheck-make ci-subset-2
 
       mingw-check:
         IMAGE: mingw-check

src/bootstrap/builder/tests.rs

@@ -598,6 +598,7 @@ fn test_with_no_doc_stage0() {
         bless: false,
         compare_mode: None,
         rustfix_coverage: false,
+        distcheck_make: None,
     };
 
     let build = Build::new(config);
@@ -640,6 +641,7 @@ fn test_exclude() {
         bless: false,
         compare_mode: None,
         rustfix_coverage: false,
+        distcheck_make: None,
     };
 
     let build = Build::new(config);

src/bootstrap/flags.rs

@@ -63,6 +63,7 @@ pub enum Subcommand {
         fail_fast: bool,
         doc_tests: DocTests,
         rustfix_coverage: bool,
+        distcheck_make: Option<String>,
     },
     Bench {
         paths: Vec<PathBuf>,
@@ -205,6 +206,12 @@ To learn more about a subcommand, run `./x.py <subcommand> -h`"
                     "enable this to generate a Rustfix coverage file, which is saved in \
                         `/<build_base>/rustfix_missing_coverage.txt`",
                 );
+                opts.optopt(
+                    "",
+                    "distcheck-make",
+                    "the Makefile target to use for distcheck (default: check)",
+                    "MAKEFILE TARGET",
+                );
             }
             "bench" => {
                 opts.optmulti("", "test-args", "extra arguments", "ARGS");
@@ -412,6 +419,7 @@ Arguments:
                 } else {
                     DocTests::Yes
                 },
+                distcheck_make: matches.opt_str("distcheck-make"),
             },
             "bench" => Subcommand::Bench {
                 paths,
@@ -524,6 +532,15 @@ impl Subcommand {
             _ => None,
         }
     }
+
+    pub fn distcheck_make(&self) -> Option<&str> {
+        match *self {
+            Subcommand::Test {
+                ref distcheck_make, ..
+            } => distcheck_make.as_ref().map(|s| s.as_str()),
+            _ => None,
+        }
+    }
 }
 
 fn split(s: &[String]) -> Vec<String> {

src/bootstrap/test.rs

@@ -1987,7 +1987,7 @@ impl Step for Distcheck {
         );
         builder.run(
             Command::new(build_helper::make(&builder.config.build))
-                .arg("check")
+                .arg(builder.config.cmd.distcheck_make().unwrap_or("check"))
                 .current_dir(&dir),
         );