From 3a3a23ffc5742885187c84e7db320610c8b352fb Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Thu, 17 Dec 2020 10:05:39 +0100 Subject: [PATCH] Fix tests --- compiler/rustc_interface/src/passes.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs index 3f30b7e69e4..8b9bf17f3f4 100644 --- a/compiler/rustc_interface/src/passes.rs +++ b/compiler/rustc_interface/src/passes.rs @@ -996,9 +996,12 @@ pub fn start_codegen<'tcx>( codegen_backend.codegen_crate(tcx, metadata, need_metadata_module) }); - rustc_incremental::assert_module_sources::assert_module_sources(tcx); - - rustc_symbol_mangling::test::report_symbol_names(tcx); + // Don't run these test assertions when not doing codegen. Compiletest tries to build + // build-fail tests in check mode first and expects it to not give an error in that case. + if tcx.sess.opts.output_types.should_codegen() { + rustc_incremental::assert_module_sources::assert_module_sources(tcx); + rustc_symbol_mangling::test::report_symbol_names(tcx); + } tcx.sess.time("assert_dep_graph", || rustc_incremental::assert_dep_graph(tcx)); tcx.sess.time("serialize_dep_graph", || rustc_incremental::save_dep_graph(tcx));