diff options
| -rw-r--r-- | src/tools/miri/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/tools/miri/miri-script/src/commands.rs | 4 | ||||
| -rw-r--r-- | src/tools/miri/tests/ui.rs (renamed from src/tools/miri/tests/compiletest.rs) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/miri/Cargo.toml b/src/tools/miri/Cargo.toml index 33a485d8939..041254e6f43 100644 --- a/src/tools/miri/Cargo.toml +++ b/src/tools/miri/Cargo.toml @@ -53,7 +53,7 @@ tempfile = "3" rustc_private = true [[test]] -name = "compiletest" +name = "ui" harness = false [features] diff --git a/src/tools/miri/miri-script/src/commands.rs b/src/tools/miri/miri-script/src/commands.rs index dc6ef58c520..7fff6ae80b4 100644 --- a/src/tools/miri/miri-script/src/commands.rs +++ b/src/tools/miri/miri-script/src/commands.rs @@ -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!( diff --git a/src/tools/miri/tests/compiletest.rs b/src/tools/miri/tests/ui.rs index 5e81689a6c2..7f363ccdfe5 100644 --- a/src/tools/miri/tests/compiletest.rs +++ b/src/tools/miri/tests/ui.rs @@ -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(); |