Skip to content

Commit 35a6dee

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 35a6dee

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

tests/testsuite/jobserver.rs

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,8 @@ fn jobserver_exists() {
5858
p.cargo("build -j2").run();
5959
}
6060

61-
#[cargo_test]
61+
#[cargo_test(requires_make)]
6262
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-
7263
let p = project()
7364
.file(
7465
"Cargo.toml",
@@ -162,7 +153,7 @@ all:
162153
drop((a2, a3));
163154
});
164155

165-
p.process(make)
156+
p.process("make")
166157
.env("CARGO", cargo_exe())
167158
.env("ADDR", addr.to_string())
168159
.arg("-j2")
@@ -172,15 +163,6 @@ all:
172163

173164
#[cargo_test]
174165
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-
184166
let p = project()
185167
.file("src/lib.rs", "")
186168
.file(
@@ -192,7 +174,7 @@ all:
192174
)
193175
.build();
194176

195-
p.process(make)
177+
p.process("make")
196178
.env("CARGO", cargo_exe())
197179
.arg("-j2")
198180
.with_stderr(

0 commit comments

Comments
 (0)