From b89d1976d1968697fd1dbb1db636d24ec641f625 Mon Sep 17 00:00:00 2001 From: Ben Kimock Date: Tue, 13 Aug 2024 18:20:48 -0400 Subject: [PATCH] Require gdb version on some tests --- tests/debuginfo/by-value-non-immediate-argument.rs | 8 +------- tests/debuginfo/macro-stepping.rs | 1 + tests/debuginfo/method-on-enum.rs | 2 +- tests/debuginfo/option-like-enum.rs | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/debuginfo/by-value-non-immediate-argument.rs b/tests/debuginfo/by-value-non-immediate-argument.rs index cf1008387cb..68717b79533 100644 --- a/tests/debuginfo/by-value-non-immediate-argument.rs +++ b/tests/debuginfo/by-value-non-immediate-argument.rs @@ -1,11 +1,5 @@ -// The gdb that we use in CI for aarch64-unknown-linux-gnu and x86_64-pc-windows-gnu seems unable -// to handle by-value non-immediate arguments, which is the whole point of this test. -// gdb on those platforms (or the version we test) just prints for structs/tuples -// and attempts to read memory at 0x0 for enums. -//@ ignore-aarch64: #128973 -//@ ignore-windows-gnu - //@ min-lldb-version: 1800 +//@ min-gdb-version: 13.0 //@ compile-flags:-g // === GDB TESTS =================================================================================== diff --git a/tests/debuginfo/macro-stepping.rs b/tests/debuginfo/macro-stepping.rs index bb465d9fb29..d469cbb761f 100644 --- a/tests/debuginfo/macro-stepping.rs +++ b/tests/debuginfo/macro-stepping.rs @@ -2,6 +2,7 @@ //@ ignore-android //@ ignore-aarch64 //@ min-lldb-version: 310 +//@ min-gdb-version: 13.0 //@ aux-build:macro-stepping.rs diff --git a/tests/debuginfo/method-on-enum.rs b/tests/debuginfo/method-on-enum.rs index c84dc348507..7bee54451aa 100644 --- a/tests/debuginfo/method-on-enum.rs +++ b/tests/debuginfo/method-on-enum.rs @@ -1,5 +1,5 @@ //@ min-lldb-version: 1800 -//@ ignore-i686-pc-windows-gnu +//@ min-gdb-version: 13.0 //@ compile-flags:-g diff --git a/tests/debuginfo/option-like-enum.rs b/tests/debuginfo/option-like-enum.rs index 10e512a16c5..da556d613d0 100644 --- a/tests/debuginfo/option-like-enum.rs +++ b/tests/debuginfo/option-like-enum.rs @@ -1,5 +1,5 @@ //@ min-lldb-version: 1800 -//@ ignore-i686-pc-windows-gnu +//@ min-gdb-version: 13.0 //@ compile-flags:-g