Skip to content

Commit 47e8cf7

Browse files
debuginfo: Gate all LLDB debuginfo tests on a minimum LLDB version being available
1 parent c29a752 commit 47e8cf7

File tree

82 files changed

+100
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+100
-16
lines changed

src/test/debuginfo/basic-types-globals-metadata.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-windows: FIXME #13256
1212
// ignore-android: FIXME(#10381)
13+
// min-lldb-version: 310
1314

1415
// compile-flags:-g
1516
// gdb-command:rbreak zzz

src/test/debuginfo/basic-types-globals.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
// ignore-windows: FIXME #13256
1818
// ignore-android: FIXME(#10381)
19+
// min-lldb-version: 310
1920

2021
// compile-flags:-g
2122
// gdb-command:rbreak zzz

src/test/debuginfo/basic-types-metadata.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415
// gdb-command:rbreak zzz

src/test/debuginfo/basic-types-mut-globals.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
// ignore-windows: FIXME #13256
1818
// ignore-android: FIXME(#10381)
19+
// min-lldb-version: 310
1920

2021
// compile-flags:-g
2122
// gdb-command:rbreak zzz

src/test/debuginfo/basic-types.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
// its numerical value.
1616

1717
// ignore-android: FIXME(#10381)
18+
// min-lldb-version: 310
1819

1920
// compile-flags:-g
2021

src/test/debuginfo/borrowed-basic.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
// its numerical value.
1515

1616
// compile-flags:-g
17+
// min-lldb-version: 310
1718

1819
// === GDB TESTS ===================================================================================
1920

src/test/debuginfo/borrowed-c-style-enum.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// ignore-android: FIXME(#10381)
1212

1313
// compile-flags:-g
14+
// min-lldb-version: 310
1415

1516
// === GDB TESTS ===================================================================================
1617

src/test/debuginfo/borrowed-enum.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-tidy-linelength
1212
// ignore-android: FIXME(#10381)
13+
// min-lldb-version: 310
1314

1415
// compile-flags:-g
1516

src/test/debuginfo/borrowed-struct.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-android: FIXME(#10381)
1212
// compile-flags:-g
13+
// min-lldb-version: 310
1314

1415
// === GDB TESTS ===================================================================================
1516

src/test/debuginfo/borrowed-tuple.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12-
12+
// min-lldb-version: 310
1313

1414
// compile-flags:-g
1515

src/test/debuginfo/borrowed-unique-basic.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// Gdb doesn't know about UTF-32 character encoding and will print a rust char as only
1415
// its numerical value.

src/test/debuginfo/box.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/boxed-struct.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/by-value-non-immediate-argument.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-tidy-linelength
1212
// ignore-android: FIXME(#10381)
13+
// min-lldb-version: 310
1314

1415
// compile-flags:-g
1516

src/test/debuginfo/by-value-self-argument-in-trait-impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12-
12+
// min-lldb-version: 310
1313

1414
// compile-flags:-g
1515

src/test/debuginfo/c-style-enum-in-composite.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-tidy-linelength
1212
// ignore-android: FIXME(#10381)
13+
// min-lldb-version: 310
1314

1415
// compile-flags:-g
1516

src/test/debuginfo/c-style-enum.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-windows: FIXME #13256
1212
// ignore-android: FIXME(#10381)
13+
// min-lldb-version: 310
1314

1415
// compile-flags:-g
1516

src/test/debuginfo/closure-in-generic-function.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/cross-crate-type-uniquing.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// aux-build:cross_crate_debuginfo_type_uniquing.rs
1415
extern crate cross_crate_debuginfo_type_uniquing;

src/test/debuginfo/destructured-fn-argument.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/destructured-local.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/evec-in-struct.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/function-arg-initialization.rs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// This test case checks if function arguments already have the correct value when breaking at the
1415
// first line of the function, that is if the function prologue has already been executed at the
@@ -18,17 +19,17 @@
1819

1920
// compile-flags:-g
2021
// gdb-command:set print pretty off
21-
// gdb-command:break function-arg-initialization.rs:243
22-
// gdb-command:break function-arg-initialization.rs:258
23-
// gdb-command:break function-arg-initialization.rs:262
24-
// gdb-command:break function-arg-initialization.rs:266
25-
// gdb-command:break function-arg-initialization.rs:270
26-
// gdb-command:break function-arg-initialization.rs:274
27-
// gdb-command:break function-arg-initialization.rs:278
28-
// gdb-command:break function-arg-initialization.rs:282
29-
// gdb-command:break function-arg-initialization.rs:286
30-
// gdb-command:break function-arg-initialization.rs:294
31-
// gdb-command:break function-arg-initialization.rs:301
22+
// gdb-command:break function-arg-initialization.rs:244
23+
// gdb-command:break function-arg-initialization.rs:259
24+
// gdb-command:break function-arg-initialization.rs:263
25+
// gdb-command:break function-arg-initialization.rs:267
26+
// gdb-command:break function-arg-initialization.rs:271
27+
// gdb-command:break function-arg-initialization.rs:275
28+
// gdb-command:break function-arg-initialization.rs:279
29+
// gdb-command:break function-arg-initialization.rs:283
30+
// gdb-command:break function-arg-initialization.rs:287
31+
// gdb-command:break function-arg-initialization.rs:295
32+
// gdb-command:break function-arg-initialization.rs:302
3233

3334
// === GDB TESTS ===================================================================================
3435

src/test/debuginfo/function-arguments.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/function-prologue-stepping-no-stack-check.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// This test case checks if function arguments already have the correct value when breaking at the
1415
// beginning of a function. Functions with the #[no_stack_check] attribute have the same prologue as

src/test/debuginfo/function-prologue-stepping-regular.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// This test case checks if function arguments already have the correct value when breaking at the
1212
// beginning of a function.
1313

14+
// min-lldb-version: 310
1415
// ignore-gdb
1516
// compile-flags:-g
1617

src/test/debuginfo/generic-function.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/generic-functions-nested.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/generic-method-on-generic-struct.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// ignore-android: FIXME(#10381)
1212

1313
// compile-flags:-g
14+
// min-lldb-version: 310
1415

1516
// === GDB TESTS ===================================================================================
1617

src/test/debuginfo/generic-static-method-on-struct-and-enum.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
15+
1416
// gdb-command:rbreak zzz
1517
// gdb-command:run
1618

src/test/debuginfo/generic-struct-style-enum.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010

1111
// ignore-tidy-linelength
1212
// ignore-android: FIXME(#10381)
13+
// min-lldb-version: 310
1314

1415
// compile-flags:-g
16+
1517
// gdb-command:set print union on
1618
// gdb-command:rbreak zzz
1719
// gdb-command:run

src/test/debuginfo/generic-struct.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-tidy-linelength
1212
// ignore-android: FIXME(#10381)
13+
// min-lldb-version: 310
1314

1415
// compile-flags:-g
1516

src/test/debuginfo/generic-tuple-style-enum.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-tidy-linelength
1212
// ignore-android: FIXME(#10381)
13+
// min-lldb-version: 310
1314

1415
// compile-flags:-g
1516

src/test/debuginfo/include_string.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415
// gdb-command:rbreak zzz

src/test/debuginfo/issue11600.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ fn main() {
1818
}
1919

2020
// ignore-android: FIXME(#10381)
21+
// ignore-lldb
2122

2223
// This test case checks whether compile unit names are set correctly, so that the correct default
2324
// source file can be found.

src/test/debuginfo/issue12886.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@
1010

1111
// ignore-android: FIXME(#10381)
1212
// ignore-windows failing on 64-bit bots FIXME #17638
13+
// ignore-lldb
1314

1415
// compile-flags:-g
15-
// gdb-command:break issue12886.rs:30
16+
// gdb-command:break issue12886.rs:31
1617
// gdb-command:run
1718
// gdb-command:next
18-
// gdb-check:[...]31[...]s
19+
// gdb-check:[...]32[...]s
1920
// gdb-command:continue
2021

2122
// IF YOU MODIFY THIS FILE, BE CAREFUL TO ADAPT THE LINE NUMBERS IN THE DEBUGGER COMMANDS
2223

2324
// This test makes sure that gdb does not set unwanted breakpoints in inlined functions. If a
24-
// breakpoint existed in unwrap(), then calling `next` would (when stopped at line 27) would stop
25+
// breakpoint existed in unwrap(), then calling `next` would (when stopped at line 31) stop
2526
// in unwrap() instead of stepping over the function invocation. By making sure that `s` is
2627
// contained in the output, after calling `next` just once, we can be sure that we did not stop in
2728
// unwrap(). (The testing framework doesn't allow for checking that some text is *not* contained in

src/test/debuginfo/issue13213.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// ignore-lldb
1213

1314
// aux-build:issue13213aux.rs
1415
extern crate issue13213aux;

src/test/debuginfo/issue14411.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// ignore-lldb
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/issue7712.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// compile-flags:--debuginfo=1
12+
// ignore-lldb
1213

1314
pub trait TraitWithDefaultMethod {
1415
fn method(self) {

src/test/debuginfo/lexical-scope-in-for-loop.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-android: FIXME(#10381)
1212
// ignore-test: Not sure what is going on here --pcwalton
13+
// min-lldb-version: 310
1314

1415
// compile-flags:-g
1516

src/test/debuginfo/lexical-scope-in-if.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

src/test/debuginfo/lexical-scope-in-match.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
// ignore-android: FIXME(#10381)
12+
// min-lldb-version: 310
1213

1314
// compile-flags:-g
1415

0 commit comments

Comments
 (0)