File tree Expand file tree Collapse file tree 1 file changed +11
-15
lines changed Expand file tree Collapse file tree 1 file changed +11
-15
lines changed Original file line number Diff line number Diff line change @@ -49,6 +49,14 @@ fn validate(_: &str) {
49
49
}
50
50
"# ;
51
51
52
+ fn make_exe ( ) -> & ' static str {
53
+ if cfg ! ( windows) {
54
+ "mingw32-make"
55
+ } else {
56
+ "make"
57
+ }
58
+ }
59
+
52
60
#[ cargo_test]
53
61
fn jobserver_exists ( ) {
54
62
let p = project ( )
@@ -64,11 +72,7 @@ fn jobserver_exists() {
64
72
65
73
#[ cargo_test]
66
74
fn external_subcommand_inherits_jobserver ( ) {
67
- let make = if cfg ! ( windows) {
68
- "mingw32-make"
69
- } else {
70
- "make"
71
- } ;
75
+ let make = make_exe ( ) ;
72
76
if Command :: new ( make) . arg ( "--version" ) . output ( ) . is_err ( ) {
73
77
return ;
74
78
}
@@ -103,11 +107,7 @@ all:
103
107
104
108
#[ cargo_test]
105
109
fn makes_jobserver_used ( ) {
106
- let make = if cfg ! ( windows) {
107
- "mingw32-make"
108
- } else {
109
- "make"
110
- } ;
110
+ let make = make_exe ( ) ;
111
111
if !is_ci ( ) && Command :: new ( make) . arg ( "--version" ) . output ( ) . is_err ( ) {
112
112
return ;
113
113
}
@@ -215,11 +215,7 @@ all:
215
215
216
216
#[ cargo_test]
217
217
fn jobserver_and_j ( ) {
218
- let make = if cfg ! ( windows) {
219
- "mingw32-make"
220
- } else {
221
- "make"
222
- } ;
218
+ let make = make_exe ( ) ;
223
219
if !is_ci ( ) && Command :: new ( make) . arg ( "--version" ) . output ( ) . is_err ( ) {
224
220
return ;
225
221
}
You can’t perform that action at this time.
0 commit comments