diff options
| author | bors <bors@rust-lang.org> | 2018-01-06 05:20:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-06 05:20:22 +0000 |
| commit | fdc6ca44c37e58be4064f44977515c66f4e07262 (patch) | |
| tree | 434c2f0c9041b1c72f014228a57c0f7ae36bd28a /src/tools/compiletest | |
| parent | 8d370ec908bf210266f1d9028a7c7a500cea45f0 (diff) | |
| parent | 0a24acda18056dd6bc4a5b8ec1897f5b34d283f4 (diff) | |
| download | rust-fdc6ca44c37e58be4064f44977515c66f4e07262.tar.gz rust-fdc6ca44c37e58be4064f44977515c66f4e07262.zip | |
Auto merge of #47155 - nerd2:debuginfo_test_fix, r=alexcrichton
Restore working debuginfo tests by trimming comments from non-header directive lines I noticed when adding a debuginfo test that nothing I did caused the test to fail. Tracing back this seems to have been caused by 3e6c83de1dc0a72df3663617d394a9e79641618d which broke parsing of the command/check lines, leaving all tests passing without any checking. This commit provides a basic (although still not very robust) restoration of tests and a should-fail test which checks the parser is running
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 1b87576ba0b..dbeee39e606 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); } |
