Skip to content

clean up code related to the rustdoc-js test suite#135386

Merged
bors merged 4 commits intorust-lang:masterfrom
lolbinarycat:bootstrap-test-cleanup
Jan 13, 2025
Merged

clean up code related to the rustdoc-js test suite#135386
bors merged 4 commits intorust-lang:masterfrom
lolbinarycat:bootstrap-test-cleanup

Conversation

@lolbinarycat
Copy link
Contributor

@lolbinarycat lolbinarycat commented Jan 12, 2025

@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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jan 12, 2025
jieyouxu
jieyouxu approved these changes Jan 12, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks

src/bootstrap/src/core/build_steps/test.rs Outdated
Comment on lines +1729 to +1730
let is_rustdoc = suite.ends_with("rustdoc-ui") || suite.ends_with("rustdoc-js");
let is_rustdoc = suite == "rustdoc-ui" || suite == RUSTDOC_JS;
Copy link
Member

@jieyouxu jieyouxu Jan 12, 2025

Choose a reason for hiding this comment

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

Remark: lol

@jieyouxu
Copy link
Member

jieyouxu commented Jan 12, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 12, 2025

📌 Commit 0962afa has been approved by jieyouxu

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 Jan 12, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Jan 12, 2025

Actually @bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 12, 2025
jieyouxu
jieyouxu reviewed Jan 12, 2025
View reviewed changes
src/bootstrap/src/core/build_steps/test.rs Outdated
use crate::{CLang, DocTests, GitRepo, Mode, PathSet, envify};

const ADB_TEST_DIR: &str = "/data/local/tmp/work";
const RUSTDOC_JS: &str = "rustdoc-js";
Copy link
Member

@jieyouxu jieyouxu Jan 12, 2025

Choose a reason for hiding this comment

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

Suggestion: for this PR, could you just inline the constant as strings? String checking is not ideal, but let's keep it consistent with the other test modes/suites for the time being.

Copy link
Contributor Author

@lolbinarycat lolbinarycat Jan 12, 2025

Choose a reason for hiding this comment

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

yeah alright, will do.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
jieyouxu
jieyouxu approved these changes Jan 12, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks, you can r=me after PR CI is green after squashing the commits into one.

@jieyouxu
Copy link
Member

jieyouxu commented Jan 12, 2025

@bors delegate+ rollup

@bors
Copy link
Collaborator

bors commented Jan 12, 2025

✌️ @lolbinarycat, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member

jieyouxu commented Jan 12, 2025

Of course, we'll need to update the compiletest side of this, because compiletest also uses the old test mode name.

@lolbinarycat
Copy link
Contributor Author

lolbinarycat commented Jan 12, 2025

oops. that's what i get for not grepping over the whole source tree :p

@rustbot rustbot added the A-compiletest Area: The compiletest test runner label Jan 12, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 12, 2025

Some changes occurred in src/tools/compiletest

cc @jieyouxu

jieyouxu
jieyouxu reviewed Jan 12, 2025
View reviewed changes
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat lolbinarycat force-pushed the bootstrap-test-cleanup branch from ce93daf to cd1b2f5 Compare January 12, 2025 03:08
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat lolbinarycat force-pushed the bootstrap-test-cleanup branch from cd1b2f5 to fa0b060 Compare January 12, 2025 04:27
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@lolbinarycat lolbinarycat force-pushed the bootstrap-test-cleanup branch from fa0b060 to d5f592a Compare January 12, 2025 06:22
@lolbinarycat
Copy link
Contributor Author

lolbinarycat commented Jan 12, 2025

@bors r=@jieyouxu

@bors
Copy link
Collaborator

bors commented Jan 12, 2025

📌 Commit d5f592a has been approved by jieyouxu

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 12, 2025
@jhpratt jhpratt mentioned this pull request Jan 13, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 13, 2025
@bors
Auto merge of rust-lang#135430 - jhpratt:rollup-39cecwd, r=jhpratt
b4045a4 
Rollup of 3 pull requests

Successful merges:

 - rust-lang#135355 (ci: added test log format for ci)
 - rust-lang#135386 (clean up code related to the rustdoc-js test suite)
 - rust-lang#135391 (bootstrap: Implement conditional `tracing` infra)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit abdd40d into rust-lang:master Jan 13, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 13, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 13, 2025
@rust-timer
Unrolled build for rust-lang#135386
c007994 
Rollup merge of rust-lang#135386 - lolbinarycat:bootstrap-test-cleanup, r=jieyouxu

clean up code related to the rustdoc-js test suite

r? `@jieyouxu`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels

A-compiletest Area: The compiletest test runner 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.86.0

Development

Successfully merging this pull request may close these issues.

5 participants

@lolbinarycat @jieyouxu @bors @rust-log-analyzer @rustbot