Skip to content

Commit de20efd

Browse files
authored
Rollup merge of rust-lang#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#146649 still causes the updated test to fail.
2 parents 06e059d + e6429c7 commit de20efd

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ add-core-stubs
2-
//@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib -Cincremental=true
2+
//@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
3+
//@ incremental (required to trigger the bug)
34
//@ needs-llvm-components: arm
45
#![feature(abi_cmse_nonsecure_call, no_core)]
56
#![no_core]
@@ -8,7 +9,7 @@ extern crate minicore;
89
use minicore::*;
910

1011
// A regression test for https://github.com/rust-lang/rust/issues/131639.
11-
// NOTE: -Cincremental=true was required for triggering the bug.
12+
// NOTE: `-Cincremental` was required for triggering the bug.
1213

1314
fn foo() {
1415
id::<extern "cmse-nonsecure-call" fn(&'a ())>(PhantomData);

tests/ui/cmse-nonsecure/cmse-nonsecure-call/undeclared-lifetime.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0261]: use of undeclared lifetime name `'a`
2-
--> $DIR/undeclared-lifetime.rs:14:43
2+
--> $DIR/undeclared-lifetime.rs:15:43
33
|
44
LL | id::<extern "cmse-nonsecure-call" fn(&'a ())>(PhantomData);
55
| ^^ undeclared lifetime

0 commit comments

Comments
 (0)