File tree Expand file tree Collapse file tree 1 file changed +3
-21
lines changed Expand file tree Collapse file tree 1 file changed +3
-21
lines changed Original file line number Diff line number Diff line change @@ -58,17 +58,8 @@ fn jobserver_exists() {
58
58
p. cargo ( "build -j2" ) . run ( ) ;
59
59
}
60
60
61
- #[ cargo_test]
61
+ #[ cargo_test( requires_make ) ]
62
62
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
63
let p = project ( )
73
64
. file (
74
65
"Cargo.toml" ,
162
153
drop ( ( a2, a3) ) ;
163
154
} ) ;
164
155
165
- p. process ( make)
156
+ p. process ( " make" )
166
157
. env ( "CARGO" , cargo_exe ( ) )
167
158
. env ( "ADDR" , addr. to_string ( ) )
168
159
. arg ( "-j2" )
@@ -172,15 +163,6 @@ all:
172
163
173
164
#[ cargo_test]
174
165
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
166
let p = project ( )
185
167
. file ( "src/lib.rs" , "" )
186
168
. file (
192
174
)
193
175
. build ( ) ;
194
176
195
- p. process ( make)
177
+ p. process ( " make" )
196
178
. env ( "CARGO" , cargo_exe ( ) )
197
179
. arg ( "-j2" )
198
180
. with_stderr (
You can’t perform that action at this time.
0 commit comments