Set rustdoc --test files' path relative to the current directory #39859
Conversation
src/librustdoc/test.rs
Outdated
| codemap.span_to_filename(self.position) | ||
| let mut filename = codemap.span_to_filename(self.position); | ||
| if let Ok(cur_dir) = env::current_dir() { | ||
| if let Some(cur_dir) = cur_dir.to_str() { |
There was a problem hiding this comment.
This should use Path::strip_prefix if possible
GuillaumeGomez
force-pushed
the
rustdoc-test-relative-path
branch
from
653b36d
to
047a215
Compare
|
Updated. |
|
@bors: r+ |
|
📌 Commit 047a215 has been approved by |
…e-path, r=alexcrichton Set rustdoc --test files' path relative to the current directory r? @alexcrichton
|
@alexcrichton: On appveyor, the tests fail because the path look like this: |
|
@GuillaumeGomez yes, that's also a standard path separator on Windows |
|
Sure, but it's a bit strange to have only one |
|
⌛ Testing commit 047a215 with merge 27a715c... |
|
💔 Test failed - status-appveyor |
|
@alexcrichton: So I forced paths to only use |
GuillaumeGomez
force-pushed
the
rustdoc-test-relative-path
branch
from
b637b63
to
e606a43
Compare
|
@bors: r+ |
|
📌 Commit e606a43 has been approved by |
|
⌛ Testing commit e606a43 with merge 23ea668... |
|
💔 Test failed - status-appveyor |
…e-path, r=alexcrichton Set rustdoc --test files' path relative to the current directory r? @alexcrichton
|
⌛ Testing commit 958fbc5 with merge ca17665... |
|
💔 Test failed - status-travis |
|
@bors: retry
* network error
…On Thu, Feb 23, 2017 at 6:32 AM, bors ***@***.***> wrote:
💔 Test failed - status-travis
<https://travis-ci.org/rust-lang/rust/builds/204567584>
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#39859 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAD95EVCCiyWFpNa088tYxohuLMb9Vmtks5rfXxPgaJpZM4MCSjR>
.
|
|
⌛ Testing commit 958fbc5 with merge f8e71ad... |
|
💔 Test failed - status-travis |
|
@bors: retry
|
…e-path, r=alexcrichton Set rustdoc --test files' path relative to the current directory r? @alexcrichton
|
⌛ Testing commit 958fbc5 with merge d00e2cb... |
…e-path, r=alexcrichton Set rustdoc --test files' path relative to the current directory r? @alexcrichton
|
💔 Test failed - status-travis |
|
@bors retry
|
|
⌛ Testing commit 958fbc5 with merge 4e45a9d... |
|
💔 Test failed - status-travis |
Rollup of 28 pull requests - Successful merges: #39859, #39864, #39888, #39903, #39905, #39914, #39945, #39950, #39953, #39961, #39980, #39988, #39993, #39995, #40019, #40020, #40022, #40024, #40025, #40026, #40027, #40031, #40035, #40037, #40038, #40064, #40069, #40086 - Failed merges: #39927, #40008, #40047
|
@bors retry
|
r? @alexcrichton