Skip to content

Commit 8e35e2f

Browse files
committed
Drop check for mingw32-make.
From what I can tell, it is no longer necessary on GitHub Actions. This removes it to help simplify things.
1 parent 7858beb commit 8e35e2f

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

tests/testsuite/jobserver.rs

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//! Tests for the jobserver protocol.
22
3-
use cargo_util::is_ci;
43
use std::net::TcpListener;
5-
use std::process::Command;
64
use std::thread;
75

86
use cargo_test_support::{cargo_exe, project};
@@ -58,17 +56,8 @@ fn jobserver_exists() {
5856
p.cargo("build -j2").run();
5957
}
6058

61-
#[cargo_test]
59+
#[cargo_test(requires_make)]
6260
fn makes_jobserver_used() {
63-
let make = if cfg!(windows) {
64-
"mingw32-make"
65-
} else {
66-
"make"
67-
};
68-
if !is_ci() && Command::new(make).arg("--version").output().is_err() {
69-
return;
70-
}
71-
7261
let p = project()
7362
.file(
7463
"Cargo.toml",
@@ -162,7 +151,7 @@ all:
162151
drop((a2, a3));
163152
});
164153

165-
p.process(make)
154+
p.process("make")
166155
.env("CARGO", cargo_exe())
167156
.env("ADDR", addr.to_string())
168157
.arg("-j2")
@@ -172,15 +161,6 @@ all:
172161

173162
#[cargo_test]
174163
fn jobserver_and_j() {
175-
let make = if cfg!(windows) {
176-
"mingw32-make"
177-
} else {
178-
"make"
179-
};
180-
if !is_ci() && Command::new(make).arg("--version").output().is_err() {
181-
return;
182-
}
183-
184164
let p = project()
185165
.file("src/lib.rs", "")
186166
.file(
@@ -192,7 +172,7 @@ all:
192172
)
193173
.build();
194174

195-
p.process(make)
175+
p.process("make")
196176
.env("CARGO", cargo_exe())
197177
.arg("-j2")
198178
.with_stderr(

0 commit comments

Comments
 (0)