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 ( )
73
22
. run ( ) ;
74
23
75
24
assert ! ( p. target_bin( t1, "foo" ) . is_file( ) ) ;
@@ -90,16 +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" ) . masquerade_as_nightly_cargo ( ) . run ( ) ;
49
+ p. cargo ( "build" ) . run ( ) ;
103
50
104
51
assert ! ( p. target_bin( t1, "foo" ) . is_file( ) ) ;
105
52
assert ! ( p. target_bin( t2, "foo" ) . is_file( ) ) ;
@@ -117,12 +64,11 @@ fn simple_test() {
117
64
. file ( "src/lib.rs" , "fn main() {}" )
118
65
. build ( ) ;
119
66
120
- p. cargo ( "test -Z multitarget " )
67
+ p. cargo ( "test" )
121
68
. arg ( "--target" )
122
69
. arg ( & t1)
123
70
. arg ( "--target" )
124
71
. arg ( & t2)
125
- . masquerade_as_nightly_cargo ( )
126
72
. with_stderr_contains ( & format ! ( "[RUNNING] [..]{}[..]" , t1) )
127
73
. with_stderr_contains ( & format ! ( "[RUNNING] [..]{}[..]" , t2) )
128
74
. run ( ) ;
@@ -135,10 +81,9 @@ fn simple_run() {
135
81
. file ( "src/main.rs" , "fn main() {}" )
136
82
. build ( ) ;
137
83
138
- p. cargo ( "run -Z multitarget - -target a --target b" )
84
+ p. cargo ( "run --target a --target b" )
139
85
. with_stderr ( "[ERROR] only one `--target` argument is supported" )
140
86
. with_status ( 101 )
141
- . masquerade_as_nightly_cargo ( )
142
87
. run ( ) ;
143
88
}
144
89
@@ -154,12 +99,11 @@ fn simple_doc() {
154
99
. file ( "src/lib.rs" , "//! empty lib" )
155
100
. build ( ) ;
156
101
157
- p. cargo ( "doc -Z multitarget " )
102
+ p. cargo ( "doc" )
158
103
. arg ( "--target" )
159
104
. arg ( & t1)
160
105
. arg ( "--target" )
161
106
. arg ( & t2)
162
- . masquerade_as_nightly_cargo ( )
163
107
. run ( ) ;
164
108
165
109
assert ! ( p. build_dir( ) . join( & t1) . join( "doc/foo/index.html" ) . is_file( ) ) ;
@@ -178,12 +122,11 @@ fn simple_check() {
178
122
. file ( "src/main.rs" , "fn main() {}" )
179
123
. build ( ) ;
180
124
181
- p. cargo ( "check -Z multitarget " )
125
+ p. cargo ( "check" )
182
126
. arg ( "--target" )
183
127
. arg ( & t1)
184
128
. arg ( "--target" )
185
129
. arg ( & t2)
186
- . masquerade_as_nightly_cargo ( )
187
130
. run ( ) ;
188
131
}
189
132
@@ -198,12 +141,11 @@ fn same_value_twice() {
198
141
. file ( "src/main.rs" , "fn main() {}" )
199
142
. build ( ) ;
200
143
201
- p. cargo ( "build -Z multitarget " )
144
+ p. cargo ( "build" )
202
145
. arg ( "--target" )
203
146
. arg ( & t)
204
147
. arg ( "--target" )
205
148
. arg ( & t)
206
- . masquerade_as_nightly_cargo ( )
207
149
. run ( ) ;
208
150
209
151
assert ! ( p. target_bin( t, "foo" ) . is_file( ) ) ;
@@ -222,16 +164,14 @@ fn same_value_twice_with_config() {
222
164
".cargo/config.toml" ,
223
165
& format ! (
224
166
r#"
225
- [unstable]
226
- multitarget = true
227
167
[build]
228
168
target = ["{t}", "{t}"]
229
169
"#
230
170
) ,
231
171
)
232
172
. build ( ) ;
233
173
234
- p. cargo ( "build" ) . masquerade_as_nightly_cargo ( ) . run ( ) ;
174
+ p. cargo ( "build" ) . run ( ) ;
235
175
236
176
assert ! ( p. target_bin( t, "foo" ) . is_file( ) ) ;
237
177
}
@@ -249,16 +189,14 @@ fn works_with_config_in_both_string_or_list() {
249
189
".cargo/config.toml" ,
250
190
& format ! (
251
191
r#"
252
- [unstable]
253
- multitarget = true
254
192
[build]
255
193
target = "{t}"
256
194
"#
257
195
) ,
258
196
)
259
197
. build ( ) ;
260
198
261
- p. cargo ( "build" ) . masquerade_as_nightly_cargo ( ) . run ( ) ;
199
+ p. cargo ( "build" ) . run ( ) ;
262
200
263
201
assert ! ( p. target_bin( t, "foo" ) . is_file( ) ) ;
264
202
@@ -268,15 +206,13 @@ fn works_with_config_in_both_string_or_list() {
268
206
".cargo/config.toml" ,
269
207
& format ! (
270
208
r#"
271
- [unstable]
272
- multitarget = true
273
209
[build]
274
210
target = ["{t}"]
275
211
"#
276
212
) ,
277
213
) ;
278
214
279
- p. cargo ( "build" ) . masquerade_as_nightly_cargo ( ) . run ( ) ;
215
+ p. cargo ( "build" ) . run ( ) ;
280
216
281
217
assert ! ( p. target_bin( t, "foo" ) . is_file( ) ) ;
282
218
}
0 commit comments