bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rename tests/compiletest → tests/ui

Browse source
This commit is contained in:
Ralf Jung 2024-03-09 09:13:50 +01:00
parent cabac98df8
commit 00be3525bf
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/miri/Cargo.toml
View file

@ -53,7 +53,7 @@ tempfile = "3"
rustc_private = true rustc_private = true
[[test]] [[test]]
name = "compiletest" name = "ui"
harness = false harness = false
[features] [features]

4
src/tools/miri/miri-script/src/commands.rs
View file

@ -510,11 +510,11 @@ impl Command {
let miri_flags = flagsplit(&miri_flags); let miri_flags = flagsplit(&miri_flags);
let toolchain = &e.toolchain; let toolchain = &e.toolchain;
let extra_flags = &e.cargo_extra_flags; let extra_flags = &e.cargo_extra_flags;
let edition_flags = (!have_edition).then_some("--edition=2021"); // keep in sync with `compiletest.rs`.` let edition_flags = (!have_edition).then_some("--edition=2021"); // keep in sync with `tests/ui.rs`.`
if dep { if dep {
cmd!( cmd!(
e.sh, e.sh,
"cargo +{toolchain} --quiet test --test compiletest {extra_flags...} --manifest-path {miri_manifest} -- --miri-run-dep-mode {miri_flags...} {edition_flags...} {flags...}" "cargo +{toolchain} --quiet test {extra_flags...} --manifest-path {miri_manifest} --test ui -- --miri-run-dep-mode {miri_flags...} {edition_flags...} {flags...}"
).quiet().run()?; ).quiet().run()?;
} else { } else {
cmd!( cmd!(

2
src/tools/miri/tests/compiletest.rs → src/tools/miri/tests/ui.rs
View file

@ -241,7 +241,7 @@ fn main() -> Result<()> {
ui_test::color_eyre::install()?; ui_test::color_eyre::install()?;
let target = get_target(); let target = get_target();
let tmpdir = tempfile::Builder::new().prefix("miri-compiletest-").tempdir()?; let tmpdir = tempfile::Builder::new().prefix("miri-uitest-").tempdir()?;
let mut args = std::env::args_os(); let mut args = std::env::args_os();