Auto merge of #3368 - RalfJung:ui, r=RalfJung
rename tests/compiletest → tests/ui This hasn't been `compiletest` in a while.
This commit is contained in:
commit
b0fad9accb
@ -53,7 +53,7 @@ tempfile = "3"
|
||||
rustc_private = true
|
||||
|
||||
[[test]]
|
||||
name = "compiletest"
|
||||
name = "ui"
|
||||
harness = false
|
||||
|
||||
[features]
|
||||
|
@ -510,11 +510,11 @@ impl Command {
|
||||
let miri_flags = flagsplit(&miri_flags);
|
||||
let toolchain = &e.toolchain;
|
||||
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 {
|
||||
cmd!(
|
||||
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()?;
|
||||
} else {
|
||||
cmd!(
|
||||
|
@ -241,7 +241,7 @@ fn main() -> Result<()> {
|
||||
ui_test::color_eyre::install()?;
|
||||
|
||||
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();
|
||||
|
Loading…
x
Reference in New Issue
Block a user