From 28dd4d974e1d3ebcaef43fd58b5f263653b97271 Mon Sep 17 00:00:00 2001
From: Sam <slancia@cisco.com>
Date: Wed, 3 Jan 2018 15:03:00 +0000
Subject: [PATCH] Restore working debuginfo tests by trimming comments from
 non-header directive lines

---
 src/test/debuginfo/should-fail.rs    | 38 ++++++++++++++++++++++++++++
 src/tools/compiletest/src/runtest.rs |  7 +++++
 2 files changed, 45 insertions(+)
 create mode 100644 src/test/debuginfo/should-fail.rs

diff --git a/src/test/debuginfo/should-fail.rs b/src/test/debuginfo/should-fail.rs
new file mode 100644
index 000000000000..1f8acb531012
--- /dev/null
+++ b/src/test/debuginfo/should-fail.rs
@@ -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() {()}
+
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index aceb472ca631..43a868a531f5 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -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);
                     }