diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-10-01 22:15:03 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-01 22:15:03 +1000 |
| commit | de20efd01e560f74649b95c1e48c8e5e21c82269 (patch) | |
| tree | 1061cf71bca8dcba2ac269aaa753d99f1fb12daa | |
| parent | 06e059d45d53d82654cad67eff3905c0577e36ab (diff) | |
| parent | e6429c74548aa2a5e20b78dca51c5f74ad59dea8 (diff) | |
| download | rust-de20efd01e560f74649b95c1e48c8e5e21c82269.tar.gz rust-de20efd01e560f74649b95c1e48c8e5e21c82269.zip | |
Rollup merge of #147217 - Zalathar:true, r=petrochenkov
Don't create a top-level `true` directory when running UI tests The funny thing about writing `-Cincremental=true` is that it *does* enable incremental compilation ... using an incremental compilation dir of `./true`. And for UI tests, that ends up creating a `true` directory in the repository root, which is annoying. Fortunately, compiletest has an existing `//@ incremental` directive that takes care of creating an empty incremental directory, and passing it to `-Cincremental`. --- I have manually checked that reverting rust-lang/rust#146649 still causes the updated test to fail.
| -rw-r--r-- | tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs | 5 | ||||
| -rw-r--r-- | tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.stderr | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs index 5fa5b74c0c0..0a0dca804ef 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs @@ -1,5 +1,6 @@ //@ add-core-stubs -//@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib -Cincremental=true +//@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib +//@ incremental (required to trigger the bug) //@ needs-llvm-components: arm #![feature(abi_cmse_nonsecure_call, no_core)] #![no_core] @@ -8,7 +9,7 @@ extern crate minicore; use minicore::*; // A regression test for https://github.com/rust-lang/rust/issues/131639. -// NOTE: -Cincremental=true was required for triggering the bug. +// NOTE: `-Cincremental` was required for triggering the bug. fn foo() { id::<extern "cmse-nonsecure-call" fn(&'a ())>(PhantomData); diff --git a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.stderr b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.stderr index 4aca17e7354..7300bdb72cd 100644 --- a/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.stderr +++ b/tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.stderr @@ -1,5 +1,5 @@ error[E0261]: use of undeclared lifetime name `'a` - --> $DIR/undeclared-lifetime.rs:14:43 + --> $DIR/undeclared-lifetime.rs:15:43 | LL | id::<extern "cmse-nonsecure-call" fn(&'a ())>(PhantomData); | ^^ undeclared lifetime |