Skip to content

Commit

Permalink
Auto merge of #10930 - ehuss:enable-windows-tests, r=weihanglo
Browse files Browse the repository at this point in the history
Enable two windows tests

These two tests were disabled on Windows a long time ago. AFAICT, the reasons are no longer relevant, and it should be safe to enable these tests. See each commit for a more detailed exposition.
  • Loading branch information
bors committed Aug 11, 2022
2 parents 1ac43cf + c0be32b commit 34cba46
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
2 changes: 0 additions & 2 deletions tests/testsuite/concurrent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion tests/testsuite/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 34cba46

Please sign in to comment.