Skip to content

Commit

Permalink
Rollup merge of rust-lang#128982 - saethlin:windows-debuginfo-tests, …
Browse files Browse the repository at this point in the history
…r=compiler-errors

Re-enable more debuginfo tests on Windows

These tests used to be disabled on all Windows hosts. Now they're fully enabled or just disabled on windows-gnu with an issue citation that clearly explains why.

The changes in this PR are not tested by PR CI, but I've tested it using try-jobs below.

try-job: i686-msvc
try-job: i686-mingw
try-job: x86_64-mingw
try-job: x86_64-msvc
  • Loading branch information
tgross35 authored Aug 17, 2024
2 parents 665ef99 + 70320c1 commit 8dd5939
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 12 deletions.
1 change: 0 additions & 1 deletion tests/debuginfo/drop-locations.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-windows
//@ ignore-android
//@ min-lldb-version: 310
//@ ignore-test: #128971
Expand Down
2 changes: 1 addition & 1 deletion tests/debuginfo/embedded-visualizer.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//@ compile-flags:-g
//@ min-gdb-version: 8.1
//@ ignore-lldb
//@ ignore-windows-gnu // emit_debug_gdb_scripts is disabled on Windows
//@ ignore-windows-gnu: #128981

// === CDB TESTS ==================================================================================

Expand Down
2 changes: 1 addition & 1 deletion tests/debuginfo/empty-string.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//@ ignore-windows failing on win32 bot
//@ ignore-windows-gnu: #128981
//@ ignore-android: FIXME(#10381)
//@ compile-flags:-g
//@ min-gdb-version: 8.1
Expand Down
3 changes: 1 addition & 2 deletions tests/debuginfo/issue-12886.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
//@ ignore-windows failing on 64-bit bots FIXME #17638
//@ ignore-lldb
//@ ignore-aarch64

//@ compile-flags:-g

// gdb-command:run
// gdb-command:next
// gdb-check:[...]24[...]let s = Some(5).unwrap(); // #break
// gdb-check:[...]23[...]let s = Some(5).unwrap(); // #break
// gdb-command:continue

#![feature(omit_gdb_pretty_printer_section)]
Expand Down
1 change: 0 additions & 1 deletion tests/debuginfo/macro-stepping.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-windows
//@ ignore-android
//@ ignore-aarch64
//@ min-lldb-version: 1800
Expand Down
2 changes: 1 addition & 1 deletion tests/debuginfo/numeric-types.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//@ compile-flags:-g

//@ min-gdb-version: 8.1
//@ ignore-windows-gnu // emit_debug_gdb_scripts is disabled on Windows
//@ ignore-windows-gnu: #128981

// Tests the visualizations for `NonZero<T>`, `Wrapping<T>` and
// `Atomic{Bool,I8,I16,I32,I64,Isize,U8,U16,U32,U64,Usize}` located in `libcore.natvis`.
Expand Down
2 changes: 1 addition & 1 deletion tests/debuginfo/pretty-huge-vec.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//@ ignore-windows failing on win32 bot
//@ ignore-windows-gnu: #128981
//@ ignore-android: FIXME(#10381)
//@ compile-flags:-g
//@ min-gdb-version: 8.1
Expand Down
2 changes: 1 addition & 1 deletion tests/debuginfo/pretty-slices.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//@ ignore-android: FIXME(#10381)
//@ ignore-windows
//@ ignore-windows-gnu: #128981
//@ compile-flags:-g

// gdb-command: run
Expand Down
1 change: 0 additions & 1 deletion tests/debuginfo/pretty-std-collections.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-windows failing on win32 bot
//@ ignore-android: FIXME(#10381)
//@ ignore-windows-gnu: #128981
//@ compile-flags:-g
Expand Down
2 changes: 1 addition & 1 deletion tests/debuginfo/pretty-uninitialized-vec.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//@ ignore-windows failing on win32 bot
//@ ignore-windows-gnu: #128981
//@ ignore-android: FIXME(#10381)
//@ compile-flags:-g
//@ min-gdb-version: 8.1
Expand Down
2 changes: 1 addition & 1 deletion tests/debuginfo/thread-names.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//@[macos] only-macos
//@[win] only-windows
//@ ignore-sgx
//@ ignore-windows-gnu
//@ ignore-windows-gnu: gdb on windows-gnu does not print thread names

// === GDB TESTS ==================================================================================
//
Expand Down

0 comments on commit 8dd5939

Please sign in to comment.