@@ -130,7 +130,7 @@ fn projects_feature_unification() {
130
130
".cargo/config.toml" ,
131
131
r#"
132
132
[resolver]
133
- feature-unification = "selected "
133
+ feature-unification = "projects "
134
134
"# ,
135
135
)
136
136
. file (
@@ -239,14 +239,21 @@ fn projects_feature_unification() {
239
239
p. cargo ( "check -p a -p b" )
240
240
. arg ( "-Zfeature-unification" )
241
241
. masquerade_as_nightly_cargo ( & [ "feature-unification" ] )
242
- . with_status ( 101 )
243
- . with_stderr_contains ( "[ERROR] features were unified" )
242
+ . with_stderr_data (
243
+ str![ [ r#"
244
+ [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
245
+
246
+ "# ] ]
247
+ . unordered ( ) ,
248
+ )
244
249
. run ( ) ;
245
250
p. cargo ( "check" )
246
251
. arg ( "-Zfeature-unification" )
247
252
. masquerade_as_nightly_cargo ( & [ "feature-unification" ] )
248
- . with_status ( 101 )
249
- . with_stderr_contains ( "[ERROR] features were unified" )
253
+ . with_stderr_data ( str![ [ r#"
254
+ [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
255
+
256
+ "# ] ] )
250
257
. run ( ) ;
251
258
}
252
259
@@ -257,7 +264,7 @@ fn projects_feature_unification_default_features() {
257
264
".cargo/config.toml" ,
258
265
r#"
259
266
[resolver]
260
- feature-unification = "selected "
267
+ feature-unification = "projects "
261
268
"# ,
262
269
)
263
270
. file (
@@ -352,8 +359,13 @@ fn projects_feature_unification_default_features() {
352
359
p. cargo ( "check" )
353
360
. arg ( "-Zfeature-unification" )
354
361
. masquerade_as_nightly_cargo ( & [ "feature-unification" ] )
355
- . with_status ( 101 )
356
- . with_stderr_contains ( "[ERROR] features were unified" )
362
+ . with_stderr_data (
363
+ str![ [ r#"
364
+ [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
365
+
366
+ "# ] ]
367
+ . unordered ( ) ,
368
+ )
357
369
. run ( ) ;
358
370
}
359
371
@@ -425,6 +437,20 @@ fn cargo_install_ignores_config() {
425
437
[INSTALLED] package `a v0.1.0 ([ROOT]/foo)` (executable `a[EXE]`)
426
438
[WARNING] be sure to add `[ROOT]/home/.cargo/bin` to your PATH to be able to run the installed binaries
427
439
440
+ "# ] ] )
441
+ . run ( ) ;
442
+ cargo_process ( "install --path" )
443
+ . arg ( p. root ( ) )
444
+ . arg ( "-Zfeature-unification" )
445
+ . masquerade_as_nightly_cargo ( & [ "feature-unification" ] )
446
+ . env ( "CARGO_RESOLVER_FEATURE_UNIFICATION" , "projects" )
447
+ . with_stderr_data ( str![ [ r#"
448
+ [INSTALLING] a v0.1.0 ([ROOT]/foo)
449
+ [FINISHED] `release` profile [optimized] target(s) in [ELAPSED]s
450
+ [REPLACING] [ROOT]/home/.cargo/bin/a
451
+ [REPLACED] package `a v0.1.0 ([ROOT]/foo)` with `a v0.1.0 ([ROOT]/foo)` (executable `a`)
452
+ [WARNING] be sure to add `[ROOT]/home/.cargo/bin` to your PATH to be able to run the installed binaries
453
+
428
454
"# ] ] )
429
455
. run ( ) ;
430
456
}
0 commit comments