From cf94bdc0742c13e2a0cac864c478b8626b266e1b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:11:38 +0200 Subject: Merging upstream version 1.66.0+dfsg1. Signed-off-by: Daniel Baumann --- src/tools/cargotest/main.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/tools/cargotest') diff --git a/src/tools/cargotest/main.rs b/src/tools/cargotest/main.rs index 95fe98a68..7044cb892 100644 --- a/src/tools/cargotest/main.rs +++ b/src/tools/cargotest/main.rs @@ -73,7 +73,7 @@ const TEST_REPOS: &[Test] = &[ Test { name: "servo", repo: "https://github.com/servo/servo", - sha: "caac107ae8145ef2fd20365e2b8fadaf09c2eb3b", + sha: "785a344e32db58d4e631fd3cae17fd1f29a721ab", 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. @@ -206,6 +206,10 @@ 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(); -- cgit v1.2.3