Combine run-pass tests into a single crate

Author: Zoxc

config.toml.example

@@ -283,6 +283,9 @@
 # desired in distributions, for example.
 #rpath = true
 
+# Merge Rust test files into larger units for faster testing
+#combine-tests = false
+
 # Suppresses extraneous output from tests to ensure the output of the test
 # harness is relatively clean.
 #quiet-tests = false

src/Cargo.lock

@@ -119,6 +119,7 @@ pub struct Config {
     pub low_priority: bool,
     pub channel: String,
     pub quiet_tests: bool,
+    pub combine_tests: bool,
     pub test_miri: bool,
     pub save_toolstates: Option<PathBuf>,
 
@@ -288,6 +289,7 @@ struct Rust {
     debug: Option<bool>,
     dist_src: Option<bool>,
     quiet_tests: Option<bool>,
+    combine_tests: Option<bool>,
     test_miri: Option<bool>,
     save_toolstates: Option<String>,
     codegen_backends: Option<Vec<String>>,
@@ -478,6 +480,7 @@ impl Config {
             set(&mut config.backtrace, rust.backtrace);
             set(&mut config.channel, rust.channel.clone());
             set(&mut config.rust_dist_src, rust.dist_src);
+            set(&mut config.combine_tests, rust.combine_tests);
             set(&mut config.quiet_tests, rust.quiet_tests);
             set(&mut config.test_miri, rust.test_miri);
             set(&mut config.wasm_syscall, rust.wasm_syscall);

src/bootstrap/config.rs

@@ -47,6 +47,7 @@ def v(*args):
 o("test-miri", "rust.test-miri", "run miri's test suite")
 o("debuginfo-tests", "rust.debuginfo-tests", "build tests with debugger metadata")
 o("quiet-tests", "rust.quiet-tests", "enable quieter output when running tests")
+o("combined-tests", "rust.combine-tests", "merge tests together when possible")
 o("ccache", "llvm.ccache", "invoke gcc/clang via ccache to reuse object files between builds")
 o("sccache", None, "invoke gcc/clang via sccache to reuse object files between builds")
 o("local-rust", None, "use an installed rustc rather than downloading a snapshot")

src/bootstrap/configure.py

@@ -848,6 +848,10 @@ impl Step for Compiletest {
         cmd.arg("--run-lib-path").arg(builder.sysroot_libdir(compiler, target));
         cmd.arg("--rustc-path").arg(builder.rustc(compiler));
 
+        if builder.config.combine_tests && mode == "run-pass" {
+            cmd.arg("--combine");
+        }
+
         // Avoid depending on rustdoc when we don't need it.
         if mode == "rustdoc" || mode == "run-make" {
             cmd.arg("--rustdoc-path").arg(builder.rustdoc(compiler.host));

src/bootstrap/test.rs

@@ -1114,6 +1114,8 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
         "generate comments into the assembly (may change behavior)"),
     no_verify: bool = (false, parse_bool, [TRACKED],
         "skip LLVM verification"),
+    submodules_crate_like: bool = (false, parse_bool, [TRACKED],
+        "pretend immediate submodules of the crate are crates themselves"),
     borrowck_stats: bool = (false, parse_bool, [UNTRACKED],
         "gather borrowck statistics"),
     no_landing_pads: bool = (false, parse_bool, [TRACKED],

src/librustc/session/config.rs

@@ -1095,7 +1095,8 @@ pub fn build_session_(
     };
     let target_cfg = config::build_target_config(&sopts, &span_diagnostic);
 
-    let p_s = parse::ParseSess::with_span_handler(span_diagnostic, codemap);
+    let mut p_s = parse::ParseSess::with_span_handler(span_diagnostic, codemap);
+    p_s.combine_test_mode = sopts.debugging_opts.submodules_crate_like;
     let default_sysroot = match sopts.maybe_sysroot {
         Some(_) => None,
         None => Some(filesearch::get_or_default_sysroot()),

src/librustc/session/mod.rs

@@ -521,7 +521,7 @@ pub fn phase_1_parse_input<'a>(control: &CompileController,
         profile::begin(sess);
     }
 
-    let krate = time(sess, "parsing", || {
+    let mut krate = time(sess, "parsing", || {
         match *input {
             Input::File(ref file) => {
                 parse::parse_crate_from_file(file, &sess.parse_sess)
@@ -549,6 +549,17 @@ pub fn phase_1_parse_input<'a>(control: &CompileController,
         syntax::show_span::run(sess.diagnostic(), s, &krate);
     }
 
+    if sess.opts.debugging_opts.submodules_crate_like {
+        krate = time(sess,
+            "Pretending submodules are crates",
+            || rustc_passes::submodules_crate_like::modify_crate(sess, krate));
+    }
+
+    if sess.opts.debugging_opts.ast_json_noexpand {
+        println!("\n\n\n\n\n\n\n\n");
+        println!("{}", json::as_json(&krate));
+    }
+
     if sess.opts.debugging_opts.hir_stats {
         hir_stats::print_ast_stats(&krate, "PRE EXPANSION AST STATS");
     }

src/librustc_driver/driver.rs

@@ -895,8 +895,8 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
         }
 
         if sess.opts.debugging_opts.parse_only ||
-           sess.opts.debugging_opts.show_span.is_some() ||
-           sess.opts.debugging_opts.ast_json_noexpand {
+           sess.opts.debugging_opts.show_span.is_some()/* ||
+           sess.opts.debugging_opts.ast_json_noexpand*/ {
             control.after_parse.stop = Compilation::Stop;
         }
 

src/librustc_driver/lib.rs

@@ -38,6 +38,7 @@ use rustc::ty::maps::Providers;
 
 mod diagnostics;
 
+pub mod submodules_crate_like;
 pub mod ast_validation;
 pub mod rvalue_promotion;
 pub mod hir_stats;