File tree Expand file tree Collapse file tree 1 file changed +3
-23
lines changed Expand file tree Collapse file tree 1 file changed +3
-23
lines changed Original file line number Diff line number Diff line change 1
1
//! Tests for the jobserver protocol.
2
2
3
- use cargo_util:: is_ci;
4
3
use std:: net:: TcpListener ;
5
- use std:: process:: Command ;
6
4
use std:: thread;
7
5
8
6
use cargo_test_support:: { cargo_exe, project} ;
@@ -58,17 +56,8 @@ fn jobserver_exists() {
58
56
p. cargo ( "build -j2" ) . run ( ) ;
59
57
}
60
58
61
- #[ cargo_test]
59
+ #[ cargo_test( requires_make ) ]
62
60
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
-
72
61
let p = project ( )
73
62
. file (
74
63
"Cargo.toml" ,
162
151
drop ( ( a2, a3) ) ;
163
152
} ) ;
164
153
165
- p. process ( make)
154
+ p. process ( " make" )
166
155
. env ( "CARGO" , cargo_exe ( ) )
167
156
. env ( "ADDR" , addr. to_string ( ) )
168
157
. arg ( "-j2" )
@@ -172,15 +161,6 @@ all:
172
161
173
162
#[ cargo_test]
174
163
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
-
184
164
let p = project ( )
185
165
. file ( "src/lib.rs" , "" )
186
166
. file (
192
172
)
193
173
. build ( ) ;
194
174
195
- p. process ( make)
175
+ p. process ( " make" )
196
176
. env ( "CARGO" , cargo_exe ( ) )
197
177
. arg ( "-j2" )
198
178
. with_stderr (
You can’t perform that action at this time.
0 commit comments