Skip to content

Commit

Permalink
Drop check for mingw32-make.
Browse files Browse the repository at this point in the history
From what I can tell, it is no longer necessary on GitHub Actions.
This removes it to help simplify things.
  • Loading branch information
ehuss committed Jul 31, 2022
1 parent 7858beb commit 8e35e2f
Showing 1 changed file with 3 additions and 23 deletions.
26 changes: 3 additions & 23 deletions tests/testsuite/jobserver.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//! Tests for the jobserver protocol.
use cargo_util::is_ci;
use std::net::TcpListener;
use std::process::Command;
use std::thread;

use cargo_test_support::{cargo_exe, project};
Expand Down Expand Up @@ -58,17 +56,8 @@ fn jobserver_exists() {
p.cargo("build -j2").run();
}

#[cargo_test]
#[cargo_test(requires_make)]
fn makes_jobserver_used() {
let make = if cfg!(windows) {
"mingw32-make"
} else {
"make"
};
if !is_ci() && Command::new(make).arg("--version").output().is_err() {
return;
}

let p = project()
.file(
"Cargo.toml",
Expand Down Expand Up @@ -162,7 +151,7 @@ all:
drop((a2, a3));
});

p.process(make)
p.process("make")
.env("CARGO", cargo_exe())
.env("ADDR", addr.to_string())
.arg("-j2")
Expand All @@ -172,15 +161,6 @@ all:

#[cargo_test]
fn jobserver_and_j() {
let make = if cfg!(windows) {
"mingw32-make"
} else {
"make"
};
if !is_ci() && Command::new(make).arg("--version").output().is_err() {
return;
}

let p = project()
.file("src/lib.rs", "")
.file(
Expand All @@ -192,7 +172,7 @@ all:
)
.build();

p.process(make)
p.process("make")
.env("CARGO", cargo_exe())
.arg("-j2")
.with_stderr(
Expand Down

0 comments on commit 8e35e2f

Please sign in to comment.