Skip to content

Commit 22d9817

Browse files
borsbors
committed
Auto merge of #3866 - rust-lang:ui_test_26_1, r=oli-obk
Bump ui test to 0.26 lots of issues fixed and various improvements 🤞 that it works this time around
2 parents d6d1d37 + 059dbb7 commit 22d9817

File tree

710 files changed

+1901
-2005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

710 files changed

+1901
-2005
lines changed

‎Cargo.lock‎

Lines changed: 28 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ windows-sys = { version = "0.52", features = [
4949

5050
[dev-dependencies]
5151
colored = "2"
52-
ui_test = "0.21.1"
52+
ui_test = "0.26.5"
5353
rustc_version = "0.4"
5454
regex = "1.5.5"
5555
tempfile = "3"

‎miri-script/src/commands.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,9 +503,13 @@ impl Command {
503503
// More flags that we will pass before `flags`
504504
// (because `flags` may contain `--`).
505505
let mut early_flags = Vec::<OsString>::new();
506-
if let Some(target) = &target {
507-
early_flags.push("--target".into());
508-
early_flags.push(target.into());
506+
507+
// In `dep` mode, the target is already passed via `MIRI_TEST_TARGET`
508+
if !dep {
509+
if let Some(target) = &target {
510+
early_flags.push("--target".into());
511+
early_flags.push(target.into());
512+
}
509513
}
510514
early_flags.push("--edition".into());
511515
early_flags.push(edition.as_deref().unwrap_or("2021").into());

‎tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ only-target-darwin
1+
//@only-target: darwin
22

33
use std::cell::UnsafeCell;
44

‎tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: abnormal termination: called os_unfair_lock_assert_not_owner on an os_unfair_lock owned by the current thread
2-
--> $DIR/apple_os_unfair_lock_assert_not_owner.rs:LL:CC
2+
--> tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.rs:LL:CC
33
|
44
LL | libc::os_unfair_lock_assert_not_owner(lock.get());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ called os_unfair_lock_assert_not_owner on an os_unfair_lock owned by the current thread
66
|
77
= note: BACKTRACE:
8-
= note: inside `main` at $DIR/apple_os_unfair_lock_assert_not_owner.rs:LL:CC
8+
= note: inside `main` at tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.rs:LL:CC
99

1010
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
1111

‎tests/fail-dep/concurrency/apple_os_unfair_lock_assert_owner.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ only-target-darwin
1+
//@only-target: darwin
22

33
use std::cell::UnsafeCell;
44

‎tests/fail-dep/concurrency/apple_os_unfair_lock_assert_owner.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: abnormal termination: called os_unfair_lock_assert_owner on an os_unfair_lock not owned by the current thread
2-
--> $DIR/apple_os_unfair_lock_assert_owner.rs:LL:CC
2+
--> tests/fail-dep/concurrency/apple_os_unfair_lock_assert_owner.rs:LL:CC
33
|
44
LL | libc::os_unfair_lock_assert_owner(lock.get());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ called os_unfair_lock_assert_owner on an os_unfair_lock not owned by the current thread
66
|
77
= note: BACKTRACE:
8-
= note: inside `main` at $DIR/apple_os_unfair_lock_assert_owner.rs:LL:CC
8+
= note: inside `main` at tests/fail-dep/concurrency/apple_os_unfair_lock_assert_owner.rs:LL:CC
99

1010
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
1111

‎tests/fail-dep/concurrency/apple_os_unfair_lock_reentrant.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ only-target-darwin
1+
//@only-target: darwin
22

33
use std::cell::UnsafeCell;
44

‎tests/fail-dep/concurrency/apple_os_unfair_lock_reentrant.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: abnormal termination: attempted to lock an os_unfair_lock that is already locked by the current thread
2-
--> $DIR/apple_os_unfair_lock_reentrant.rs:LL:CC
2+
--> tests/fail-dep/concurrency/apple_os_unfair_lock_reentrant.rs:LL:CC
33
|
44
LL | libc::os_unfair_lock_lock(lock.get());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempted to lock an os_unfair_lock that is already locked by the current thread
66
|
77
= note: BACKTRACE:
8-
= note: inside `main` at $DIR/apple_os_unfair_lock_reentrant.rs:LL:CC
8+
= note: inside `main` at tests/fail-dep/concurrency/apple_os_unfair_lock_reentrant.rs:LL:CC
99

1010
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
1111

‎tests/fail-dep/concurrency/apple_os_unfair_lock_unowned.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ only-target-darwin
1+
//@only-target: darwin
22

33
use std::cell::UnsafeCell;
44

0 commit comments

Comments
 (0)