From 01747aa14538d9b90b0fb34307444f1e7ed6c287 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 2 Aug 2022 12:30:42 -0700 Subject: [PATCH 1/2] Re-enable killing_cargo_releases_the_lock on windows. AFAICT, we do not test on these older platforms anymore. Regardless, the test seems to work fine on 32-bit windows-gnu on Windows 10. See https://github.com/rust-lang/cargo/pull/3102#issuecomment-260815269 where it was originally disabled. --- tests/testsuite/concurrent.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/testsuite/concurrent.rs b/tests/testsuite/concurrent.rs index 51d02f32bff..fe4ecfc4229 100644 --- a/tests/testsuite/concurrent.rs +++ b/tests/testsuite/concurrent.rs @@ -351,9 +351,7 @@ fn same_project() { // Make sure that if Cargo dies while holding a lock that it's released and the // next Cargo to come in will take over cleanly. -// older win versions don't support job objects, so skip test there #[cargo_test] -#[cfg_attr(target_os = "windows", ignore)] fn killing_cargo_releases_the_lock() { let p = project() .file( From c0be32b5de72d307cc23463b532300e183e5fa18 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 2 Aug 2022 12:54:16 -0700 Subject: [PATCH 2/2] Re-enable version_works_without_rustc on windows. This test was ignored in https://github.com/rust-lang/cargo/pull/3189 without much discussion of explaining why. AFAICT, this test works fine on Windows on both MSVC and GNU. Empty paths do the expected behavior (preventing cargo from running rustc). There are some special rules on Windows about discovering the process to run (such as searching the app's launch directory), but I do not think that is relevant here. Confirmed by trying to run `cargo check` in this test fails to find `rustc`. --- tests/testsuite/version.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/testsuite/version.rs b/tests/testsuite/version.rs index a5e4676dd46..f880c75a6a4 100644 --- a/tests/testsuite/version.rs +++ b/tests/testsuite/version.rs @@ -16,7 +16,6 @@ fn simple() { } #[cargo_test] -#[cfg_attr(target_os = "windows", ignore)] fn version_works_without_rustc() { let p = project().build(); p.cargo("version").env("PATH", "").run();