Skip to content

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

Merged
bors merged 3 commits into
rust-lang:masterfrom
GuillaumeGomez:rustdoc-test-relative-path
Feb 25, 2017
Merged

Set rustdoc --test files' path relative to the current directory#39859
bors merged 3 commits into
rust-lang:masterfrom
GuillaumeGomez:rustdoc-test-relative-path

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Comment thread src/librustdoc/test.rs Outdated

Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Member Author

Updated.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Feb 16, 2017

Copy link
Copy Markdown
Collaborator

📌 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
Copy Markdown
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
Copy Markdown
Member

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

@GuillaumeGomez

Copy link
Copy Markdown
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

bors commented Feb 18, 2017

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Feb 18, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@GuillaumeGomez

Copy link
Copy Markdown
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
Copy Markdown
Member Author

cc @alexcrichton

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Feb 21, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit e606a43 has been approved by alexcrichton

@bors

bors commented Feb 21, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e606a43 with merge 23ea668...

@bors

bors commented Feb 21, 2017

Copy link
Copy Markdown
Collaborator

💔 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

bors commented Feb 23, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 958fbc5 with merge ca17665...

@bors

bors commented Feb 23, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

alexcrichton commented Feb 23, 2017 via email

Copy link
Copy Markdown
Member

@bors

bors commented Feb 24, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 958fbc5 with merge f8e71ad...

@bors

bors commented Feb 24, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

Copy link
Copy Markdown
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

bors commented Feb 25, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Feb 25, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@eddyb

eddyb commented Feb 25, 2017

Copy link
Copy Markdown
Contributor

@bors retry

  • manually cancelled to prioritize rollup

@bors

bors commented Feb 25, 2017

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Feb 25, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

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

eddyb commented Feb 25, 2017

Copy link
Copy Markdown
Contributor

@bors retry

  • manually cancelled to prioritize rollup

@bors

bors commented Feb 25, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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