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) {
4949}
5050"# ;
5151
52+ fn make_exe ( ) -> & ' static str {
53+ if cfg ! ( windows) {
54+ "mingw32-make"
55+ } else {
56+ "make"
57+ }
58+ }
59+
5260#[ cargo_test]
5361fn jobserver_exists ( ) {
5462 let p = project ( )
@@ -64,11 +72,7 @@ fn jobserver_exists() {
6472
6573#[ cargo_test]
6674fn external_subcommand_inherits_jobserver ( ) {
67- let make = if cfg ! ( windows) {
68- "mingw32-make"
69- } else {
70- "make"
71- } ;
75+ let make = make_exe ( ) ;
7276 if Command :: new ( make) . arg ( "--version" ) . output ( ) . is_err ( ) {
7377 return ;
7478 }
@@ -103,11 +107,7 @@ all:
103107
104108#[ cargo_test]
105109fn makes_jobserver_used ( ) {
106- let make = if cfg ! ( windows) {
107- "mingw32-make"
108- } else {
109- "make"
110- } ;
110+ let make = make_exe ( ) ;
111111 if !is_ci ( ) && Command :: new ( make) . arg ( "--version" ) . output ( ) . is_err ( ) {
112112 return ;
113113 }
@@ -215,11 +215,7 @@ all:
215215
216216#[ cargo_test]
217217fn jobserver_and_j ( ) {
218- let make = if cfg ! ( windows) {
219- "mingw32-make"
220- } else {
221- "make"
222- } ;
218+ let make = make_exe ( ) ;
223219 if !is_ci ( ) && Command :: new ( make) . arg ( "--version" ) . output ( ) . is_err ( ) {
224220 return ;
225221 }
You can’t perform that action at this time.
0 commit comments