Bump ui test

rust-lang · Sep 8, 2024 · 1fdb363 · 1fdb363
1 parent 335c91c
commit 1fdb363
Show file tree

Hide file tree

Showing 685 changed files with 1,956 additions and 1,895 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,6 +27,7 @@ ctrlc = "3.2.5"
 chrono = { version = "0.4.38", default-features = false }
 chrono-tz = "0.9"
 directories = "5"
+crossbeam = "0.8.4"
 
 # Copied from `compiler/rustc/Cargo.toml`.
 # 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 = [
 
 [dev-dependencies]
 colored = "2"
-ui_test = "0.21.1"
+ui_test = "0.26.1"
 rustc_version = "0.4"
 regex = "1.5.5"
 tempfile = "3"

diff --git a/tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.rs b/tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.rs
@@ -1,4 +1,4 @@
-//@ only-target-darwin
+//@ only-target: darwin
 
 use std::cell::UnsafeCell;
 

diff --git a/tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.stderr b/tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.stderr
@@ -1,11 +1,11 @@
 error: abnormal termination: called os_unfair_lock_assert_not_owner on an os_unfair_lock owned by the current thread
-  --> $DIR/apple_os_unfair_lock_assert_not_owner.rs:LL:CC
+  --> tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.rs:LL:CC
    |
 LL |         libc::os_unfair_lock_assert_not_owner(lock.get());
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ called os_unfair_lock_assert_not_owner on an os_unfair_lock owned by the current thread
    |
    = note: BACKTRACE:
-   = note: inside `main` at $DIR/apple_os_unfair_lock_assert_not_owner.rs:LL:CC
+   = note: inside `main` at tests/fail-dep/concurrency/apple_os_unfair_lock_assert_not_owner.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

diff --git a/tests/fail-dep/concurrency/apple_os_unfair_lock_assert_owner.rs b/tests/fail-dep/concurrency/apple_os_unfair_lock_assert_owner.rs
@@ -1,4 +1,4 @@
-//@ only-target-darwin
+//@ only-target: darwin
 
 use std::cell::UnsafeCell;
 

diff --git a/tests/fail-dep/concurrency/apple_os_unfair_lock_assert_owner.stderr b/tests/fail-dep/concurrency/apple_os_unfair_lock_assert_owner.stderr
@@ -1,11 +1,11 @@
 error: abnormal termination: called os_unfair_lock_assert_owner on an os_unfair_lock not owned by the current thread
-  --> $DIR/apple_os_unfair_lock_assert_owner.rs:LL:CC
+  --> tests/fail-dep/concurrency/apple_os_unfair_lock_assert_owner.rs:LL:CC
    |
 LL |         libc::os_unfair_lock_assert_owner(lock.get());
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ called os_unfair_lock_assert_owner on an os_unfair_lock not owned by the current thread
    |
    = note: BACKTRACE:
-   = note: inside `main` at $DIR/apple_os_unfair_lock_assert_owner.rs:LL:CC
+   = note: inside `main` at tests/fail-dep/concurrency/apple_os_unfair_lock_assert_owner.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

diff --git a/tests/fail-dep/concurrency/apple_os_unfair_lock_reentrant.rs b/tests/fail-dep/concurrency/apple_os_unfair_lock_reentrant.rs
@@ -1,4 +1,4 @@
-//@ only-target-darwin
+//@ only-target: darwin
 
 use std::cell::UnsafeCell;
 

diff --git a/tests/fail-dep/concurrency/apple_os_unfair_lock_reentrant.stderr b/tests/fail-dep/concurrency/apple_os_unfair_lock_reentrant.stderr
@@ -1,11 +1,11 @@
 error: abnormal termination: attempted to lock an os_unfair_lock that is already locked by the current thread
-  --> $DIR/apple_os_unfair_lock_reentrant.rs:LL:CC
+  --> tests/fail-dep/concurrency/apple_os_unfair_lock_reentrant.rs:LL:CC
    |
 LL |         libc::os_unfair_lock_lock(lock.get());
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempted to lock an os_unfair_lock that is already locked by the current thread
    |
    = note: BACKTRACE:
-   = note: inside `main` at $DIR/apple_os_unfair_lock_reentrant.rs:LL:CC
+   = note: inside `main` at tests/fail-dep/concurrency/apple_os_unfair_lock_reentrant.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

diff --git a/tests/fail-dep/concurrency/apple_os_unfair_lock_unowned.rs b/tests/fail-dep/concurrency/apple_os_unfair_lock_unowned.rs
@@ -1,4 +1,4 @@
-//@ only-target-darwin
+//@ only-target: darwin
 
 use std::cell::UnsafeCell;
 

diff --git a/tests/fail-dep/concurrency/apple_os_unfair_lock_unowned.stderr b/tests/fail-dep/concurrency/apple_os_unfair_lock_unowned.stderr
@@ -1,11 +1,11 @@
 error: abnormal termination: attempted to unlock an os_unfair_lock not owned by the current thread
-  --> $DIR/apple_os_unfair_lock_unowned.rs:LL:CC
+  --> tests/fail-dep/concurrency/apple_os_unfair_lock_unowned.rs:LL:CC
    |
 LL |         libc::os_unfair_lock_unlock(lock.get());
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempted to unlock an os_unfair_lock not owned by the current thread
    |
    = note: BACKTRACE:
-   = note: inside `main` at $DIR/apple_os_unfair_lock_unowned.rs:LL:CC
+   = note: inside `main` at tests/fail-dep/concurrency/apple_os_unfair_lock_unowned.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.rs b/tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.rs
@@ -1,4 +1,5 @@
-//@ignore-target-windows: No pthreads on Windows
+// No pthreads on Windows
+//@ignore-target: windows
 
 /// Test that destroying a pthread_cond twice fails, even without a check for number validity
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.stderr b/tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.stderr
@@ -1,13 +1,13 @@
 error: Undefined Behavior: using uninitialized data, but this operation requires initialized memory
-  --> $DIR/libc_pthread_cond_double_destroy.rs:LL:CC
+  --> tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.rs:LL:CC
    |
 LL |         libc::pthread_cond_destroy(cond.as_mut_ptr());
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
    = note: BACKTRACE:
-   = note: inside `main` at $DIR/libc_pthread_cond_double_destroy.rs:LL:CC
+   = note: inside `main` at tests/fail-dep/concurrency/libc_pthread_cond_double_destroy.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.rs b/tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.rs
@@ -1,5 +1,7 @@
-//@ignore-target-windows: No pthreads on Windows
-//@ignore-target-apple: Our macOS condattr don't have any fields so we do not notice this.
+// No pthreads on Windows
+//@ignore-target: windows
+// Our macOS condattr don't have any fields so we do not notice this.
+//@ignore-target: apple
 
 /// Test that destroying a pthread_condattr twice fails, even without a check for number validity
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.stderr b/tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.stderr
@@ -1,13 +1,13 @@
 error: Undefined Behavior: using uninitialized data, but this operation requires initialized memory
-  --> $DIR/libc_pthread_condattr_double_destroy.rs:LL:CC
+  --> tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.rs:LL:CC
    |
 LL |         libc::pthread_condattr_destroy(attr.as_mut_ptr());
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ using uninitialized data, but this operation requires initialized memory
    |
    = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
    = note: BACKTRACE:
-   = note: inside `main` at $DIR/libc_pthread_condattr_double_destroy.rs:LL:CC
+   = note: inside `main` at tests/fail-dep/concurrency/libc_pthread_condattr_double_destroy.rs:LL:CC
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_create_main_terminate.rs b/tests/fail-dep/concurrency/libc_pthread_create_main_terminate.rs
@@ -1,4 +1,5 @@
-//@ignore-target-windows: No pthreads on Windows
+// No pthreads on Windows
+//@ignore-target: windows
 //@error-in-other-file: the main thread terminated without waiting for all remaining threads
 
 // Check that we terminate the program when the main thread terminates.

diff --git a/tests/fail-dep/concurrency/libc_pthread_create_too_few_args.rs b/tests/fail-dep/concurrency/libc_pthread_create_too_few_args.rs
@@ -1,5 +1,6 @@
-//@ignore-target-windows: No pthreads on Windows
-//~^ERROR: calling a function with more arguments than it expected
+// No pthreads on Windows
+//@ignore-target: windows
+//~^^ERROR: calling a function with more arguments than it expected
 
 //! The thread function must have exactly one argument.
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_create_too_many_args.rs b/tests/fail-dep/concurrency/libc_pthread_create_too_many_args.rs
@@ -1,5 +1,6 @@
-//@ignore-target-windows: No pthreads on Windows
-//~^ERROR: calling a function with fewer arguments than it requires
+// No pthreads on Windows
+//@ignore-target: windows
+//~^^ERROR: calling a function with fewer arguments than it requires
 
 //! The thread function must have exactly one argument.
 

diff --git a/tests/fail-dep/concurrency/libc_pthread_join_detached.rs b/tests/fail-dep/concurrency/libc_pthread_join_detached.rs
@@ -1,4 +1,5 @@
-//@ignore-target-windows: No pthreads on Windows
+// No pthreads on Windows
+//@ignore-target: windows
 
 // Joining a detached thread is undefined behavior.