2
2
3
3
use cargo_test_support:: { basic_manifest, cross_compile, project, rustc_host} ;
4
4
5
- #[ cargo_test]
6
- fn double_target_rejected ( ) {
7
- let p = project ( )
8
- . file ( "Cargo.toml" , & basic_manifest ( "foo" , "1.0.0" ) )
9
- . file ( "src/main.rs" , "fn main() {}" )
10
- . build ( ) ;
11
-
12
- p. cargo ( "build --target a --target b" )
13
- . with_stderr ( "[ERROR] specifying multiple `--target` flags requires `-Zmultitarget`" )
14
- . with_status ( 101 )
15
- . run ( ) ;
16
- }
17
-
18
- #[ cargo_test]
19
- fn array_of_target_rejected_with_config ( ) {
20
- let p = project ( )
21
- . file ( "Cargo.toml" , & basic_manifest ( "foo" , "1.0.0" ) )
22
- . file ( "src/main.rs" , "fn main() {}" )
23
- . file (
24
- ".cargo/config.toml" ,
25
- r#"
26
- [build]
27
- target = ["a", "b"]
28
- "# ,
29
- )
30
- . build ( ) ;
31
-
32
- p. cargo ( "build" )
33
- . with_stderr (
34
- "[ERROR] specifying an array in `build.target` config value requires `-Zmultitarget`" ,
35
- )
36
- . with_status ( 101 )
37
- . run ( ) ;
38
-
39
- p. change_file (
40
- ".cargo/config.toml" ,
41
- r#"
42
- [build]
43
- target = ["a"]
44
- "# ,
45
- ) ;
46
-
47
- p. cargo ( "build" )
48
- . with_stderr (
49
- "[ERROR] specifying an array in `build.target` config value requires `-Zmultitarget`" ,
50
- )
51
- . with_status ( 101 )
52
- . run ( ) ;
53
- }
54
-
55
5
#[ cargo_test]
56
6
fn simple_build ( ) {
57
7
if cross_compile:: disabled ( ) {
@@ -64,12 +14,11 @@ fn simple_build() {
64
14
. file ( "src/main.rs" , "fn main() {}" )
65
15
. build ( ) ;
66
16
67
- p. cargo ( "build -Z multitarget " )
17
+ p. cargo ( "build" )
68
18
. arg ( "--target" )
69
19
. arg ( & t1)
70
20
. arg ( "--target" )
71
21
. arg ( & t2)
72
- . masquerade_as_nightly_cargo ( & [ "multitarget" ] )
73
22
. run ( ) ;
74
23
75
24
assert ! ( p. target_bin( t1, "foo" ) . is_file( ) ) ;
@@ -90,18 +39,14 @@ fn simple_build_with_config() {
90
39
".cargo/config.toml" ,
91
40
& format ! (
92
41
r#"
93
- [unstable]
94
- multitarget = true
95
42
[build]
96
43
target = ["{t1}", "{t2}"]
97
44
"#
98
45
) ,
99
46
)
100
47
. build ( ) ;
101
48
102
- p. cargo ( "build" )
103
- . masquerade_as_nightly_cargo ( & [ "multitarget" ] )
104
- . run ( ) ;
49
+ p. cargo ( "build" ) . run ( ) ;
105
50
106
51
assert ! ( p. target_bin( t1, "foo" ) . is_file( ) ) ;
107
52
assert ! ( p. target_bin( t2, "foo" ) . is_file( ) ) ;
@@ -119,12 +64,11 @@ fn simple_test() {
119
64
. file ( "src/lib.rs" , "fn main() {}" )
120
65
. build ( ) ;
121
66
122
- p. cargo ( "test -Z multitarget " )
67
+ p. cargo ( "test" )
123
68
. arg ( "--target" )
124
69
. arg ( & t1)
125
70
. arg ( "--target" )
126
71
. arg ( & t2)
127
- . masquerade_as_nightly_cargo ( & [ "multitarget" ] )
128
72
. with_stderr_contains ( & format ! ( "[RUNNING] [..]{}[..]" , t1) )
129
73
. with_stderr_contains ( & format ! ( "[RUNNING] [..]{}[..]" , t2) )
130
74
. run ( ) ;
@@ -137,10 +81,9 @@ fn simple_run() {
137
81
. file ( "src/main.rs" , "fn main() {}" )
138
82
. build ( ) ;
139
83
140
- p. cargo ( "run -Z multitarget - -target a --target b" )
84
+ p. cargo ( "run --target a --target b" )
141
85
. with_stderr ( "[ERROR] only one `--target` argument is supported" )
142
86
. with_status ( 101 )
143
- . masquerade_as_nightly_cargo ( & [ "multitarget" ] )
144
87
. run ( ) ;
145
88
}
146
89
@@ -156,12 +99,11 @@ fn simple_doc() {
156
99
. file ( "src/lib.rs" , "//! empty lib" )
157
100
. build ( ) ;
158
101
159
- p. cargo ( "doc -Z multitarget " )
102
+ p. cargo ( "doc" )
160
103
. arg ( "--target" )
161
104
. arg ( & t1)
162
105
. arg ( "--target" )
163
106
. arg ( & t2)
164
- . masquerade_as_nightly_cargo ( & [ "multitarget" ] )
165
107
. run ( ) ;
166
108
167
109
assert ! ( p. build_dir( ) . join( & t1) . join( "doc/foo/index.html" ) . is_file( ) ) ;
@@ -180,12 +122,11 @@ fn simple_check() {
180
122
. file ( "src/main.rs" , "fn main() {}" )
181
123
. build ( ) ;
182
124
183
- p. cargo ( "check -Z multitarget " )
125
+ p. cargo ( "check" )
184
126
. arg ( "--target" )
185
127
. arg ( & t1)
186
128
. arg ( "--target" )
187
129
. arg ( & t2)
188
- . masquerade_as_nightly_cargo ( & [ "multitarget" ] )
189
130
. run ( ) ;
190
131
}
191
132
@@ -200,12 +141,11 @@ fn same_value_twice() {
200
141
. file ( "src/main.rs" , "fn main() {}" )
201
142
. build ( ) ;
202
143
203
- p. cargo ( "build -Z multitarget " )
144
+ p. cargo ( "build" )
204
145
. arg ( "--target" )
205
146
. arg ( & t)
206
147
. arg ( "--target" )
207
148
. arg ( & t)
208
- . masquerade_as_nightly_cargo ( & [ "multitarget" ] )
209
149
. run ( ) ;
210
150
211
151
assert ! ( p. target_bin( t, "foo" ) . is_file( ) ) ;
@@ -224,18 +164,14 @@ fn same_value_twice_with_config() {
224
164
".cargo/config.toml" ,
225
165
& format ! (
226
166
r#"
227
- [unstable]
228
- multitarget = true
229
167
[build]
230
168
target = ["{t}", "{t}"]
231
169
"#
232
170
) ,
233
171
)
234
172
. build ( ) ;
235
173
236
- p. cargo ( "build" )
237
- . masquerade_as_nightly_cargo ( & [ "multitarget" ] )
238
- . run ( ) ;
174
+ p. cargo ( "build" ) . run ( ) ;
239
175
240
176
assert ! ( p. target_bin( t, "foo" ) . is_file( ) ) ;
241
177
}
@@ -253,18 +189,14 @@ fn works_with_config_in_both_string_or_list() {
253
189
".cargo/config.toml" ,
254
190
& format ! (
255
191
r#"
256
- [unstable]
257
- multitarget = true
258
192
[build]
259
193
target = "{t}"
260
194
"#
261
195
) ,
262
196
)
263
197
. build ( ) ;
264
198
265
- p. cargo ( "build" )
266
- . masquerade_as_nightly_cargo ( & [ "multitarget" ] )
267
- . run ( ) ;
199
+ p. cargo ( "build" ) . run ( ) ;
268
200
269
201
assert ! ( p. target_bin( t, "foo" ) . is_file( ) ) ;
270
202
@@ -274,17 +206,13 @@ fn works_with_config_in_both_string_or_list() {
274
206
".cargo/config.toml" ,
275
207
& format ! (
276
208
r#"
277
- [unstable]
278
- multitarget = true
279
209
[build]
280
210
target = ["{t}"]
281
211
"#
282
212
) ,
283
213
) ;
284
214
285
- p. cargo ( "build" )
286
- . masquerade_as_nightly_cargo ( & [ "multitarget" ] )
287
- . run ( ) ;
215
+ p. cargo ( "build" ) . run ( ) ;
288
216
289
217
assert ! ( p. target_bin( t, "foo" ) . is_file( ) ) ;
290
218
}
0 commit comments