Skip to content

Commit 1fdb363

Browse files
committed
Bump ui test
1 parent 335c91c commit 1fdb363

File tree

685 files changed

+1956
-1895
lines changed

Some content is hidden

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

685 files changed

+1956
-1895
lines changed

Cargo.lock

+70-52
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ ctrlc = "3.2.5"
2727
chrono = { version = "0.4.38", default-features = false }
2828
chrono-tz = "0.9"
2929
directories = "5"
30+
crossbeam = "0.8.4"
3031

3132
# Copied from `compiler/rustc/Cargo.toml`.
3233
# But only for some targets, it fails for others. Rustc configures this in its CI, but we can't
@@ -49,7 +50,7 @@ windows-sys = { version = "0.52", features = [
4950

5051
[dev-dependencies]
5152
colored = "2"
52-
ui_test = "0.21.1"
53+
ui_test = "0.26.1"
5354
rustc_version = "0.4"
5455
regex = "1.5.5"
5556
tempfile = "3"

tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.rs

+1-1
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

+2-2
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

+1-1
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

+2-2
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

+1-1
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

+2-2
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

+1-1
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_unowned.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: abnormal termination: attempted to unlock an os_unfair_lock not owned by the current thread
2-
--> $DIR/apple_os_unfair_lock_unowned.rs:LL:CC
2+
--> tests/fail-dep/concurrency/apple_os_unfair_lock_unowned.rs:LL:CC
33
|
44
LL | libc::os_unfair_lock_unlock(lock.get());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempted to unlock an os_unfair_lock not owned by the current thread
66
|
77
= note: BACKTRACE:
8-
= note: inside `main` at $DIR/apple_os_unfair_lock_unowned.rs:LL:CC
8+
= note: inside `main` at tests/fail-dep/concurrency/apple_os_unfair_lock_unowned.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/libc_pthread_cond_double_destroy.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
//@ignore-target-windows: No pthreads on Windows
1+
// No pthreads on Windows
2+
//@ignore-target: windows
23

34
/// Test that destroying a pthread_cond twice fails, even without a check for number validity
45

tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: Undefined Behavior: using uninitialized data, but this operation requires initialized memory
2-
--> $DIR/libc_pthread_cond_double_destroy.rs:LL:CC
2+
--> tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.rs:LL:CC
33
|
44
LL | libc::pthread_cond_destroy(cond.as_mut_ptr());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
10-
= note: inside `main` at $DIR/libc_pthread_cond_double_destroy.rs:LL:CC
10+
= note: inside `main` at tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.rs:LL:CC
1111

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

tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
//@ignore-target-windows: No pthreads on Windows
2-
//@ignore-target-apple: Our macOS condattr don't have any fields so we do not notice this.
1+
// No pthreads on Windows
2+
//@ignore-target: windows
3+
// Our macOS condattr don't have any fields so we do not notice this.
4+
//@ignore-target: apple
35

46
/// Test that destroying a pthread_condattr twice fails, even without a check for number validity
57

tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: Undefined Behavior: using uninitialized data, but this operation requires initialized memory
2-
--> $DIR/libc_pthread_condattr_double_destroy.rs:LL:CC
2+
--> tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.rs:LL:CC
33
|
44
LL | libc::pthread_condattr_destroy(attr.as_mut_ptr());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
99
= note: BACKTRACE:
10-
= note: inside `main` at $DIR/libc_pthread_condattr_double_destroy.rs:LL:CC
10+
= note: inside `main` at tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.rs:LL:CC
1111

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

tests/fail-dep/concurrency/libc_pthread_create_main_terminate.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
//@ignore-target-windows: No pthreads on Windows
1+
// No pthreads on Windows
2+
//@ignore-target: windows
23
//@error-in-other-file: the main thread terminated without waiting for all remaining threads
34

45
// Check that we terminate the program when the main thread terminates.

tests/fail-dep/concurrency/libc_pthread_create_too_few_args.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
//@ignore-target-windows: No pthreads on Windows
2-
//~^ERROR: calling a function with more arguments than it expected
1+
// No pthreads on Windows
2+
//@ignore-target: windows
3+
//~^^ERROR: calling a function with more arguments than it expected
34

45
//! The thread function must have exactly one argument.
56

tests/fail-dep/concurrency/libc_pthread_create_too_many_args.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
//@ignore-target-windows: No pthreads on Windows
2-
//~^ERROR: calling a function with fewer arguments than it requires
1+
// No pthreads on Windows
2+
//@ignore-target: windows
3+
//~^^ERROR: calling a function with fewer arguments than it requires
34

45
//! The thread function must have exactly one argument.
56

tests/fail-dep/concurrency/libc_pthread_join_detached.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
//@ignore-target-windows: No pthreads on Windows
1+
// No pthreads on Windows
2+
//@ignore-target: windows
23

34
// Joining a detached thread is undefined behavior.
45

0 commit comments

Comments
 (0)