Skip to content

Commit

Permalink
Restore working debuginfo tests by trimming comments from non-header …
Browse files Browse the repository at this point in the history
…directive lines
  • Loading branch information
Sam committed Jan 3, 2018
1 parent b9cf26c commit 28dd4d9
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
38 changes: 38 additions & 0 deletions src/test/debuginfo/should-fail.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// min-lldb-version: 310

// == Test [gdb|lldb]-[command|check] are parsed correctly ===
// should-fail
// compile-flags:-g

// === GDB TESTS ===================================================================================

// gdb-command: run

// gdb-command: print x
// gdb-check:$1 = 5

// === LLDB TESTS ==================================================================================

// lldb-command:run

// lldb-command:print x
// lldb-check:[...]$0 = 5

fn main() {
let x = 1;

zzz(); // #break
}

fn zzz() {()}

7 changes: 7 additions & 0 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,13 @@ impl<'test> TestCx<'test> {
for line in reader.lines() {
match line {
Ok(line) => {
let line =
if line.starts_with("//") {
line[2..].trim_left()
} else {
line.as_str()
};

if line.contains("#break") {
breakpoint_lines.push(counter);
}
Expand Down

0 comments on commit 28dd4d9

Please sign in to comment.