diff --git a/src/doc/rustc-dev-guide/src/tests/ecosystem.md b/src/doc/rustc-dev-guide/src/tests/ecosystem.md index eee07dd079bbf..9e5b3a1e1c11d 100644 --- a/src/doc/rustc-dev-guide/src/tests/ecosystem.md +++ b/src/doc/rustc-dev-guide/src/tests/ecosystem.md @@ -14,7 +14,7 @@ CI. See the [Crater chapter](crater.md) for more details. ### `cargotest` `cargotest` is a small tool which runs `cargo test` on a few sample projects -(such as `servo`, `ripgrep`, `tokei`, etc.). This runs as part of CI and ensures +(such as `stylo`, `ripgrep`, `tokei`, etc.). This runs as part of CI and ensures there aren't any significant regressions: ```console diff --git a/src/tools/cargotest/main.rs b/src/tools/cargotest/main.rs index e920d49eb2e44..82531f328da66 100644 --- a/src/tools/cargotest/main.rs +++ b/src/tools/cargotest/main.rs @@ -70,13 +70,11 @@ const TEST_REPOS: &[Test] = &[ ], }, Test { - name: "servo", - repo: "https://github.com/servo/servo", - sha: "785a344e32db58d4e631fd3cae17fd1f29a721ab", + name: "stylo", + repo: "https://github.com/servo/stylo", + sha: "127b0b5cab6a6927552e889debb20beb031b79d1", lock: None, - // Only test Stylo a.k.a. Quantum CSS, the parts of Servo going into Firefox. - // This takes much less time to build than all of Servo and supports stable Rust. - packages: &["selectors"], + packages: &["selectors", "stylo"], features: None, manifest_path: None, filters: &[], @@ -213,10 +211,6 @@ fn run_cargo_test( .env("CFG_DISABLE_CROSS_TESTS", "1") // Relax #![deny(warnings)] in some crates .env("RUSTFLAGS", "--cap-lints warn") - // servo tries to use 'lld-link.exe' on windows, but we don't - // have lld on our PATH in CI. Override it to use 'link.exe' - .env("CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER", "link.exe") - .env("CARGO_TARGET_I686_PC_WINDOWS_MSVC_LINKER", "link.exe") .current_dir(crate_path) .status() .unwrap();