Skip to content

Revert "Drop check for mingw32-make." #10934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2022
Merged

Revert "Drop check for mingw32-make." #10934

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions tests/testsuite/jobserver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
//! 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 @@ -56,8 +58,17 @@ fn jobserver_exists() {
p.cargo("build -j2").run();
}

#[cargo_test(requires_make)]
#[cargo_test]
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 @@ -151,7 +162,7 @@ all:
drop((a2, a3));
});

p.process("make")
p.process(make)
.env("CARGO", cargo_exe())
.env("ADDR", addr.to_string())
.arg("-j2")
Expand All @@ -161,6 +172,15 @@ 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 @@ -172,7 +192,7 @@ all:
)
.build();

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