diff options
| author | the8472 <the8472@users.noreply.github.com> | 2021-09-22 19:03:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 19:03:23 +0200 |
| commit | 0cbddffe25d44c583caa9c2bf853ff7402e326d9 (patch) | |
| tree | 6eeaedc3749a35c56d5a376c9b1972694bd2238f /src/test/debuginfo | |
| parent | 5948a7b40799d0c0ab4dd171375a335402686ff6 (diff) | |
| parent | bd5bc49d0553235ea0ea04bf96b9abb873505087 (diff) | |
| download | rust-0cbddffe25d44c583caa9c2bf853ff7402e326d9.tar.gz rust-0cbddffe25d44c583caa9c2bf853ff7402e326d9.zip | |
Rollup merge of #89127 - wesleywiser:reenable_mutex_debuginfo_test, r=ehuss
Re-enable the `src/test/debuginfo/mutex.rs` test on Windows This test required a newer version of cdb than was previously enabled in CI thus leading to some bitrot in the test since the time it was originally created. With the update to the `windows-latest` image last week, we're now running this test in CI and thus uncovered the regression. I've updated the test and it now passes. r? `@ehuss`
Diffstat (limited to 'src/test/debuginfo')
| -rw-r--r-- | src/test/debuginfo/mutex.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/test/debuginfo/mutex.rs b/src/test/debuginfo/mutex.rs index 4a529541bae..00dccf5f906 100644 --- a/src/test/debuginfo/mutex.rs +++ b/src/test/debuginfo/mutex.rs @@ -3,8 +3,6 @@ // cdb-only // min-cdb-version: 10.0.21287.1005 // compile-flags:-g -// FIXME: Failed on update to 10.0.22000.1 -// ignore-windows // === CDB TESTS ================================================================================== // @@ -14,17 +12,17 @@ // cdb-check:m,d [Type: std::sync::mutex::Mutex<i32>] // cdb-check: [...] inner [Type: std::sys_common::mutex::MovableMutex] // cdb-check: [...] poison [Type: std::sync::poison::Flag] -// cdb-check: [...] data [Type: core::cell::UnsafeCell<i32>] +// cdb-check: [...] data : 0 [Type: core::cell::UnsafeCell<i32>] // // cdb-command:dx m.data,d -// cdb-check:m.data,d [Type: core::cell::UnsafeCell<i32>] -// cdb-check: [...] value : 0 [Type: int] +// cdb-check:m.data,d : 0 [Type: core::cell::UnsafeCell<i32>] +// cdb-check: [<Raw View>] [Type: core::cell::UnsafeCell<i32>] // // cdb-command:dx lock,d -// cdb-check:lock,d : Ok [Type: enum$<core::result::Result<std::sync::mutex::MutexGuard<i32>, enum$<std::sync::poison::TryLockError<std::sync::mutex::MutexGuard<i32> >, 0, 1, Poisoned> > >] -// cdb-check: [...] variant$ : Ok (0) [Type: core::result::Result] +// cdb-check:lock,d : Ok [Type: enum$<core::result::Result<std::sync::mutex::MutexGuard<i32>,enum$<std::sync::poison::TryLockError<std::sync::mutex::MutexGuard<i32> >, 0, 1, Poisoned> > >] +// cdb-check: [variant] : Ok // cdb-check: [...] __0 [Type: std::sync::mutex::MutexGuard<i32>] use std::sync::Mutex; |