diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:11:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:13:23 +0000 |
| commit | 20431706a863f92cb37dc512fef6e48d192aaf2c (patch) | |
| tree | 2867f13f5fd5437ba628c67d7f87309ccadcd286 /src/tools/cargotest/main.rs | |
| parent | Releasing progress-linux version 1.65.0+dfsg1-2~progress7.99u1. (diff) | |
| download | rustc-20431706a863f92cb37dc512fef6e48d192aaf2c.tar.xz rustc-20431706a863f92cb37dc512fef6e48d192aaf2c.zip | |
Merging upstream version 1.66.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/tools/cargotest/main.rs')
| -rw-r--r-- | src/tools/cargotest/main.rs | 6 |
1 files changed, 5 insertions, 1 deletions
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(); |