user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename 'js-doc-test' to 'rustdoc-js' in compiletest

Browse source
This commit is contained in:
binarycat 2025-01-11 20:37:20 -06:00
parent a55bc72cea
commit 16286cefcf
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/compiletest/src/common.rs
View file

@ -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",

2
src/tools/compiletest/src/header/tests.rs
View file

@ -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",

2
src/tools/compiletest/src/lib.rs
View file

@ -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(
"",

8
src/tools/compiletest/src/runtest.rs
View file

@ -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,
@ -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(),
@ -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 => {
@ -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
}
}