mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #129731 - ferrocene:x-test-compiler, r=onur-ozkan

Browse Source 
Allow running `./x.py test compiler`
This commit is contained in:
Matthias Krüger 2024-08-31 10:08:57 +02:00 committed by GitHub
commit 6c8b07f71a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bootstrap/src/core/build_steps/test.rs
View File

@ -14,9 +14,8 @@
use crate::core::build_steps::tool::{self, SourceType, Tool}; use crate::core::build_steps::tool::{self, SourceType, Tool};
use crate::core::build_steps::toolstate::ToolState; use crate::core::build_steps::toolstate::ToolState;
use crate::core::build_steps::{compile, dist, llvm}; use crate::core::build_steps::{compile, dist, llvm};
use crate::core::builder;
use crate::core::builder::{ use crate::core::builder::{
crate_description, Builder, Compiler, Kind, RunConfig, ShouldRun, Step, self, crate_description, Alias, Builder, Compiler, Kind, RunConfig, ShouldRun, Step,
}; };
use crate::core::config::flags::{get_completion, Subcommand}; use crate::core::config::flags::{get_completion, Subcommand};
use crate::core::config::TargetSelection; use crate::core::config::TargetSelection;
@ -2435,18 +2434,14 @@ impl Step for CrateLibrustc {
const ONLY_HOSTS: bool = true; const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.crate_or_deps("rustc-main") run.crate_or_deps("rustc-main").path("compiler")
} }
fn make_run(run: RunConfig<'_>) { fn make_run(run: RunConfig<'_>) {
let builder = run.builder; let builder = run.builder;
let host = run.build_triple(); let host = run.build_triple();
let compiler = builder.compiler_for(builder.top_stage, host, host); let compiler = builder.compiler_for(builder.top_stage, host, host);
let crates = run let crates = run.make_run_crates(Alias::Compiler);
.paths
.iter()
.map(|p| builder.crate_paths[&p.assert_single_path().path].clone())
.collect();
builder.ensure(CrateLibrustc { compiler, target: run.target, crates }); builder.ensure(CrateLibrustc { compiler, target: run.target, crates });
} }