Skip to content

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

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.

Sign up for GitHub

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

Merged
bors merged 4 commits into from
Jan 13, 2025
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0962afa
clean up code related to the rustdoc-js test suite
lolbinarycat Jan 11, 2025
a55bc72
don't use a string constant
lolbinarycat Jan 12, 2025
16286ce
rename 'js-doc-test' to 'rustdoc-js' in compiletest
lolbinarycat Jan 12, 2025
d5f592a
rename run_js_doc_test to run_rustdoc_js_test
lolbinarycat Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tools/compiletest/src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ string_enum! {
Incremental => "incremental",
RunMake => "run-make",
Ui => "ui",
JsDocTest => "js-doc-test",
RustdocJs => "rustdoc-js",
MirOpt => "mir-opt",
Assembly => "assembly",
CoverageMap => "coverage-map",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/compiletest/src/header/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ fn test_forbidden_revisions_allowed_in_non_filecheck_dir() {
"codegen-units",
"incremental",
"ui",
"js-doc-test",
"rustdoc-js",
"coverage-map",
"coverage-run",
"crashes",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/compiletest/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
"which sort of compile tests to run",
"pretty | debug-info | codegen | rustdoc \
| rustdoc-json | codegen-units | incremental | run-make | ui \
| js-doc-test | mir-opt | assembly | crashes",
| rustdoc-js | mir-opt | assembly | crashes",
)
.reqopt(
"",
Expand Down
8 changes: 4 additions & 4 deletions src/tools/compiletest/src/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use tracing::*;

use crate::common::{
Assembly, Codegen, CodegenUnits, CompareMode, Config, CoverageMap, CoverageRun, Crashes,
DebugInfo, Debugger, FailMode, Incremental, JsDocTest, MirOpt, PassMode, Pretty, RunMake,
DebugInfo, Debugger, FailMode, Incremental, RustdocJs, MirOpt, PassMode, Pretty, RunMake,
Rustdoc, RustdocJson, TestPaths, UI_EXTENSIONS, UI_FIXED, UI_RUN_STDERR, UI_RUN_STDOUT,
UI_STDERR, UI_STDOUT, UI_SVG, UI_WINDOWS_SVG, Ui, expected_output_path, incremental_dir,
output_base_dir, output_base_name, output_testname_unique,
Expand Down Expand Up @@ -269,7 +269,7 @@ impl<'test> TestCx<'test> {
Ui => self.run_ui_test(),
MirOpt => self.run_mir_opt_test(),
Assembly => self.run_assembly_test(),
JsDocTest => self.run_js_doc_test(),
RustdocJs => self.run_js_doc_test(),
CoverageMap => self.run_coverage_map_test(), // see self::coverage
CoverageRun => self.run_coverage_run_test(), // see self::coverage
Crashes => self.run_crash_test(),
Expand Down Expand Up @@ -303,7 +303,7 @@ impl<'test> TestCx<'test> {

fn should_compile_successfully(&self, pm: Option<PassMode>) -> bool {
match self.config.mode {
JsDocTest => true,
RustdocJs => true,
Ui => pm.is_some() || self.props.fail_mode > Some(FailMode::Build),
Crashes => false,
Incremental => {
Expand Down Expand Up @@ -1627,7 +1627,7 @@ impl<'test> TestCx<'test> {
Crashes => {
set_mir_dump_dir(&mut rustc);
}
Pretty | DebugInfo | Rustdoc | RustdocJson | RunMake | CodegenUnits | JsDocTest => {
Pretty | DebugInfo | Rustdoc | RustdocJson | RunMake | CodegenUnits | RustdocJs => {
// do not use JSON output
}
}
Expand Down
Loading