Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set rustdoc --test files' path relative to the current directory #39859

Merged
merged 3 commits into from
Feb 25, 2017

Conversation

GuillaumeGomez
Copy link
Member

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() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should use Path::strip_prefix if possible

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Taking a look!

@GuillaumeGomez GuillaumeGomez force-pushed the rustdoc-test-relative-path branch from 653b36d to 047a215 Compare February 16, 2017 21:35
@GuillaumeGomez
Copy link
Member Author

Updated.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 16, 2017

📌 Commit 047a215 has been approved by alexcrichton

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Feb 17, 2017
…e-path, r=alexcrichton

Set rustdoc --test files' path relative to the current directory

r? @alexcrichton
@GuillaumeGomez
Copy link
Member Author

@alexcrichton: On appveyor, the tests fail because the path look like this: src/abc\def\ghi\jkl. Why is there a / on windows? O.o

@alexcrichton
Copy link
Member

@GuillaumeGomez yes, that's also a standard path separator on Windows

@GuillaumeGomez
Copy link
Member Author

Sure, but it's a bit strange to have only one \ whereas there are only /. And I have no clue how to enforce the first or the other one to avoid test failure...

@bors
Copy link
Contributor

bors commented Feb 18, 2017

⌛ Testing commit 047a215 with merge 27a715c...

@bors
Copy link
Contributor

bors commented Feb 18, 2017

💔 Test failed - status-appveyor

@GuillaumeGomez
Copy link
Member Author

@alexcrichton: So I forced paths to only use / in the compiletest. Does it seem ok to you?

@GuillaumeGomez GuillaumeGomez force-pushed the rustdoc-test-relative-path branch from b637b63 to e606a43 Compare February 20, 2017 00:12
@GuillaumeGomez
Copy link
Member Author

cc @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 21, 2017

📌 Commit e606a43 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Feb 21, 2017

⌛ Testing commit e606a43 with merge 23ea668...

@bors
Copy link
Contributor

bors commented Feb 21, 2017

💔 Test failed - status-appveyor

bors added a commit that referenced this pull request Feb 23, 2017
Rollup of 11 pull requests

- Successful merges: #39859, #39886, #39892, #39903, #39914, #39918, #39988, #40010, #40027, #40030, #40035
- Failed merges:
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 23, 2017
…e-path, r=alexcrichton

Set rustdoc --test files' path relative to the current directory

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Feb 23, 2017

⌛ Testing commit 958fbc5 with merge ca17665...

@bors
Copy link
Contributor

bors commented Feb 23, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Feb 23, 2017 via email

@bors
Copy link
Contributor

bors commented Feb 24, 2017

⌛ Testing commit 958fbc5 with merge f8e71ad...

@bors
Copy link
Contributor

bors commented Feb 24, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

@bors: retry

  • empty logs?

eddyb added a commit to eddyb/rust that referenced this pull request Feb 25, 2017
…e-path, r=alexcrichton

Set rustdoc --test files' path relative to the current directory

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Feb 25, 2017

⌛ Testing commit 958fbc5 with merge d00e2cb...

eddyb added a commit to eddyb/rust that referenced this pull request Feb 25, 2017
…e-path, r=alexcrichton

Set rustdoc --test files' path relative to the current directory

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Feb 25, 2017

💔 Test failed - status-travis

@eddyb
Copy link
Member

eddyb commented Feb 25, 2017

@bors retry

  • manually cancelled to prioritize rollup

@bors
Copy link
Contributor

bors commented Feb 25, 2017

⌛ Testing commit 958fbc5 with merge 4e45a9d...

@bors
Copy link
Contributor

bors commented Feb 25, 2017

💔 Test failed - status-travis

bors added a commit that referenced this pull request Feb 25, 2017
@eddyb
Copy link
Member

eddyb commented Feb 25, 2017

@bors retry

  • manually cancelled to prioritize rollup

@bors
Copy link
Contributor

bors commented Feb 25, 2017

⌛ Testing commit 958fbc5 with merge 1572bf1...

@bors bors merged commit 958fbc5 into rust-lang:master Feb 25, 2017
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-test-relative-path branch February 27, 2017 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants