Skip to content

Commit

Permalink
Bump ui test
Browse files Browse the repository at this point in the history
  • Loading branch information
Oli Scherer committed Sep 8, 2024
1 parent 7de570b commit 8776642
Show file tree
Hide file tree
Showing 688 changed files with 1,988 additions and 1,923 deletions.
122 changes: 70 additions & 52 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -49,7 +50,7 @@ windows-sys = { version = "0.52", features = [

[dev-dependencies]
colored = "2"
ui_test = "0.21.1"
ui_test = "0.26.3"
rustc_version = "0.4"
regex = "1.5.5"
tempfile = "3"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//@ only-target-darwin
//@ only-target: darwin

use std::cell::UnsafeCell;

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//@ only-target-darwin
//@ only-target: darwin

use std::cell::UnsafeCell;

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//@ only-target-darwin
//@ only-target: darwin

use std::cell::UnsafeCell;

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/fail-dep/concurrency/apple_os_unfair_lock_unowned.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//@ only-target-darwin
//@ only-target: darwin

use std::cell::UnsafeCell;

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
3 changes: 2 additions & 1 deletion tests/fail-dep/concurrency/libc_pthread_join_detached.rs
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
Loading

0 comments on commit 8776642

Please sign in to comment.