Skip to content

Fix running rustdoc-js test suite individually #69198

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Feb 19, 2020

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Feb 15, 2020

Without Compiletest.path set running x.py test src/test/rustdoc-js would run the rustdoc-js test suite with everything filtered out.

As this was the only place setting Compiletest.path to None this removes the Option wrapper as well.

Without `Compiletest.path` set running `x.py test src/test/rustdoc-js` would run the `rustdoc-js` test suite with everything filtered out.

As this was the only place setting `Compiletest.path` to `None` this removes the `Option` wrapper as well.
@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 15, 2020
@ollie27
Copy link
Member Author

ollie27 commented Feb 15, 2020

As a bit of context, the code here was added by #49729 and I'm not sure using Option was ever correct. Also 6063777 looks like it fixed this same issue for rustdoc-ui.

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

Yeah, looks like a bug in the original implementation. Thanks for the PR!

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 15, 2020

📌 Commit 3300725 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 15, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 16, 2020
…k-Simulacrum

Fix running rustdoc-js test suite individually

Without `Compiletest.path` set running `x.py test src/test/rustdoc-js` would run the `rustdoc-js` test suite with everything filtered out.

As this was the only place setting `Compiletest.path` to `None` this removes the `Option` wrapper as well.
@bors
Copy link
Collaborator

bors commented Feb 19, 2020

⌛ Testing commit 3300725 with merge 7d6b8c4...

bors added a commit that referenced this pull request Feb 19, 2020
Fix running rustdoc-js test suite individually

Without `Compiletest.path` set running `x.py test src/test/rustdoc-js` would run the `rustdoc-js` test suite with everything filtered out.

As this was the only place setting `Compiletest.path` to `None` this removes the `Option` wrapper as well.
@bors
Copy link
Collaborator

bors commented Feb 19, 2020

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 7d6b8c4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 19, 2020
@bors bors merged commit 3300725 into rust-lang:master Feb 19, 2020
@ollie27 ollie27 deleted the rustbuild_rustdoc-js branch February 22, 2020 18:14
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants