@@ -30,7 +30,6 @@ use crate::utils::render_tests::{add_flags_and_try_run_tests, try_run_tests};
3030use crate :: { CLang , DocTests , GitRepo , Mode , PathSet , envify} ;
3131
3232const ADB_TEST_DIR : & str = "/data/local/tmp/work" ;
33- const RUSTDOC_JS : & str = "rustdoc-js" ;
3433
3534/// Runs `cargo test` on various internal tools used by bootstrap.
3635#[ derive( Debug , Clone , PartialEq , Eq , Hash ) ]
@@ -915,8 +914,8 @@ impl Step for RustdocJSNotStd {
915914 builder. ensure ( Compiletest {
916915 compiler : self . compiler ,
917916 target : self . target ,
918- mode : RUSTDOC_JS ,
919- suite : RUSTDOC_JS ,
917+ mode : "rustdoc-js" ,
918+ suite : "rustdoc-js" ,
920919 path : "tests/rustdoc-js" ,
921920 compare_mode : None ,
922921 } ) ;
@@ -1727,7 +1726,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
17271726 cmd. arg ( "--minicore-path" )
17281727 . arg ( builder. src . join ( "tests" ) . join ( "auxiliary" ) . join ( "minicore.rs" ) ) ;
17291728
1730- let is_rustdoc = suite == "rustdoc-ui" || suite == RUSTDOC_JS ;
1729+ let is_rustdoc = suite == "rustdoc-ui" || suite == "rustdoc-js" ;
17311730
17321731 if mode == "run-make" {
17331732 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
17551754 if mode == "rustdoc"
17561755 || mode == "run-make"
17571756 || ( mode == "ui" && is_rustdoc)
1758- || mode == RUSTDOC_JS
1757+ || mode == "rustdoc-js"
17591758 || mode == "rustdoc-json"
17601759 || suite == "coverage-run-rustdoc"
17611760 {
@@ -1827,7 +1826,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
18271826
18281827 if let Some ( ref nodejs) = builder. config . nodejs {
18291828 cmd. arg ( "--nodejs" ) . arg ( nodejs) ;
1830- } else if mode == RUSTDOC_JS {
1829+ } else if mode == "rustdoc-js" {
18311830 panic ! ( "need nodejs to run rustdoc-js suite" ) ;
18321831 }
18331832 if let Some ( ref npm) = builder. config . npm {
0 commit comments