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

Fix rustdoc-gui tests on Windows #112613

Merged
merged 4 commits into from
Jun 14, 2023

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jun 14, 2023

The browser-ui-test update contains fixes needed for backslash handling (they were not correctly escaped).

Since we have a mix of slash and backslash in some tests, I replaced DOC_FOLDER variable backslashes with slashes.

And finally it seemed like the unicode escaped wasn't much appreciated on Windows for some reason so I used the character directly.

cc @klensy
r? @notriddle

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 14, 2023
@klensy
Copy link
Contributor

klensy commented Jun 14, 2023

Nice! this with #112562 allows running rustdoc-gui on x86_64-pc-windows-msvc target.

@notriddle
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 14, 2023

📌 Commit fced638 has been approved by notriddle

It is now in the queue for this repository.

@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 Jun 14, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#112584 (loongarch64-none*: Remove environment component from llvm target)
 - rust-lang#112600 (Introduce a `Stable` trait to translate MIR to SMIR)
 - rust-lang#112605 (Improve docs/clean up negative overlap functions)
 - rust-lang#112611 (Error on unconstrained lifetime in RPITIT)
 - rust-lang#112612 (Fix explicit-outlives-requirements lint span)
 - rust-lang#112613 (Fix rustdoc-gui tests on Windows)
 - rust-lang#112620 (Fix small typo)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 77b307f into rust-lang:master Jun 14, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 14, 2023
@GuillaumeGomez GuillaumeGomez deleted the fix-gui-test-windows branch June 15, 2023 08:32
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 15, 2023
…eGomez

rustdoc-gui: allow running on Windows

This adds few fixes to allow running `python x.py test rustdoc-gui` on Windows.

* path to npm required to be `npm.cmd` on Windows (otherwise don't work for me)
* properly parse node module version on Windows
* properly provide path to browser-ui-test runner (fixed in rust-lang#112613)

r? `@GuillaumeGomez`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants