itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop check for mingw32-make.

Browse Source 
From what I can tell, it is no longer necessary on GitHub Actions.
This removes it to help simplify things.
This commit is contained in:
Eric Huss 2022-07-31 15:57:24 -07:00
parent 7858bebb0e
commit 8e35e2f044
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/testsuite/jobserver.rs
View File

@ -1,8 +1,6 @@
//! Tests for the jobserver protocol. //! Tests for the jobserver protocol.
use cargo_util::is_ci;
use std::net::TcpListener; use std::net::TcpListener;
use std::process::Command;
use std::thread; use std::thread;
use cargo_test_support::{cargo_exe, project}; use cargo_test_support::{cargo_exe, project};
@ -58,17 +56,8 @@ fn jobserver_exists() {
p.cargo("build -j2").run(); p.cargo("build -j2").run();
} }
#[cargo_test] #[cargo_test(requires_make)]
fn makes_jobserver_used() { 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() let p = project()
.file( .file(
"Cargo.toml", "Cargo.toml",
@ -162,7 +151,7 @@ all:
drop((a2, a3)); drop((a2, a3));
}); });
p.process(make) p.process("make")
.env("CARGO", cargo_exe()) .env("CARGO", cargo_exe())
.env("ADDR", addr.to_string()) .env("ADDR", addr.to_string())
.arg("-j2") .arg("-j2")
@ -172,15 +161,6 @@ all:
#[cargo_test] #[cargo_test]
fn jobserver_and_j() { 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() let p = project()
.file("src/lib.rs", "") .file("src/lib.rs", "")
.file( .file(
@ -192,7 +172,7 @@ all:
) )
.build(); .build();
p.process(make) p.process("make")
.env("CARGO", cargo_exe()) .env("CARGO", cargo_exe())
.arg("-j2") .arg("-j2")
.with_stderr( .with_stderr(