Skip to content

Commit bd5bc49

Browse files
committed
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.
1 parent db1fb85 commit bd5bc49

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/test/debuginfo/mutex.rs

+5-7
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// cdb-only
44
// min-cdb-version: 10.0.21287.1005
55
// compile-flags:-g
6-
// FIXME: Failed on update to 10.0.22000.1
7-
// ignore-windows
86

97
// === CDB TESTS ==================================================================================
108
//
@@ -14,17 +12,17 @@
1412
// cdb-check:m,d [Type: std::sync::mutex::Mutex<i32>]
1513
// cdb-check: [...] inner [Type: std::sys_common::mutex::MovableMutex]
1614
// cdb-check: [...] poison [Type: std::sync::poison::Flag]
17-
// cdb-check: [...] data [Type: core::cell::UnsafeCell<i32>]
15+
// cdb-check: [...] data : 0 [Type: core::cell::UnsafeCell<i32>]
1816

1917
//
2018
// cdb-command:dx m.data,d
21-
// cdb-check:m.data,d [Type: core::cell::UnsafeCell<i32>]
22-
// cdb-check: [...] value : 0 [Type: int]
19+
// cdb-check:m.data,d : 0 [Type: core::cell::UnsafeCell<i32>]
20+
// cdb-check: [<Raw View>] [Type: core::cell::UnsafeCell<i32>]
2321

2422
//
2523
// cdb-command:dx lock,d
26-
// 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> > >]
27-
// cdb-check: [...] variant$ : Ok (0) [Type: core::result::Result]
24+
// 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> > >]
25+
// cdb-check: [variant] : Ok
2826
// cdb-check: [...] __0 [Type: std::sync::mutex::MutexGuard<i32>]
2927

3028
use std::sync::Mutex;

0 commit comments

Comments
 (0)