@@ -30,7 +30,6 @@ use crate::utils::render_tests::{add_flags_and_try_run_tests, try_run_tests};
30
30
use crate :: { CLang , DocTests , GitRepo , Mode , PathSet , envify} ;
31
31
32
32
const ADB_TEST_DIR : & str = "/data/local/tmp/work" ;
33
- const RUSTDOC_JS : & str = "rustdoc-js" ;
34
33
35
34
/// Runs `cargo test` on various internal tools used by bootstrap.
36
35
#[ derive( Debug , Clone , PartialEq , Eq , Hash ) ]
@@ -915,8 +914,8 @@ impl Step for RustdocJSNotStd {
915
914
builder. ensure ( Compiletest {
916
915
compiler : self . compiler ,
917
916
target : self . target ,
918
- mode : RUSTDOC_JS ,
919
- suite : RUSTDOC_JS ,
917
+ mode : "rustdoc-js" ,
918
+ suite : "rustdoc-js" ,
920
919
path : "tests/rustdoc-js" ,
921
920
compare_mode : None ,
922
921
} ) ;
@@ -1727,7 +1726,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
1727
1726
cmd. arg ( "--minicore-path" )
1728
1727
. arg ( builder. src . join ( "tests" ) . join ( "auxiliary" ) . join ( "minicore.rs" ) ) ;
1729
1728
1730
- let is_rustdoc = suite == "rustdoc-ui" || suite == RUSTDOC_JS ;
1729
+ let is_rustdoc = suite == "rustdoc-ui" || suite == "rustdoc-js" ;
1731
1730
1732
1731
if mode == "run-make" {
1733
1732
let cargo_path = if builder. top_stage == 0 {
@@ -1755,7 +1754,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
1755
1754
if mode == "rustdoc"
1756
1755
|| mode == "run-make"
1757
1756
|| ( mode == "ui" && is_rustdoc)
1758
- || mode == RUSTDOC_JS
1757
+ || mode == "rustdoc-js"
1759
1758
|| mode == "rustdoc-json"
1760
1759
|| suite == "coverage-run-rustdoc"
1761
1760
{
@@ -1827,7 +1826,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
1827
1826
1828
1827
if let Some ( ref nodejs) = builder. config . nodejs {
1829
1828
cmd. arg ( "--nodejs" ) . arg ( nodejs) ;
1830
- } else if mode == RUSTDOC_JS {
1829
+ } else if mode == "rustdoc-js" {
1831
1830
panic ! ( "need nodejs to run rustdoc-js suite" ) ;
1832
1831
}
1833
1832
if let Some ( ref npm) = builder. config . npm {
0 commit comments