@@ -411,12 +411,10 @@ fn custom_build_env_var_rustc_linker_host_target() {
411
411
412
412
// no crate type set => linker never called => build succeeds if and
413
413
// only if build.rs succeeds, despite linker binary not existing.
414
- if cargo_test_support:: is_nightly ( ) {
415
- p. cargo ( "build -Z target-applies-to-host --target" )
416
- . arg ( & target)
417
- . masquerade_as_nightly_cargo ( )
418
- . run ( ) ;
419
- }
414
+ p. cargo ( "build -Z target-applies-to-host --target" )
415
+ . arg ( & target)
416
+ . masquerade_as_nightly_cargo ( )
417
+ . run ( ) ;
420
418
}
421
419
422
420
#[ cargo_test]
@@ -448,13 +446,11 @@ fn custom_build_env_var_rustc_linker_host_target_env() {
448
446
449
447
// no crate type set => linker never called => build succeeds if and
450
448
// only if build.rs succeeds, despite linker binary not existing.
451
- if cargo_test_support:: is_nightly ( ) {
452
- p. cargo ( "build -Z target-applies-to-host --target" )
453
- . env ( "CARGO_TARGET_APPLIES_TO_HOST" , "false" )
454
- . arg ( & target)
455
- . masquerade_as_nightly_cargo ( )
456
- . run ( ) ;
457
- }
449
+ p. cargo ( "build -Z target-applies-to-host --target" )
450
+ . env ( "CARGO_TARGET_APPLIES_TO_HOST" , "false" )
451
+ . arg ( & target)
452
+ . masquerade_as_nightly_cargo ( )
453
+ . run ( ) ;
458
454
}
459
455
460
456
#[ cargo_test]
@@ -485,18 +481,16 @@ fn custom_build_invalid_host_config_feature_flag() {
485
481
. build ( ) ;
486
482
487
483
// build.rs should fail due to -Zhost-config being set without -Ztarget-applies-to-host
488
- if cargo_test_support:: is_nightly ( ) {
489
- p. cargo ( "build -Z host-config --target" )
490
- . arg ( & target)
491
- . masquerade_as_nightly_cargo ( )
492
- . with_status ( 101 )
493
- . with_stderr_contains (
494
- "\
484
+ p. cargo ( "build -Z host-config --target" )
485
+ . arg ( & target)
486
+ . masquerade_as_nightly_cargo ( )
487
+ . with_status ( 101 )
488
+ . with_stderr_contains (
489
+ "\
495
490
error: the -Zhost-config flag requires the -Ztarget-applies-to-host flag to be set
496
491
" ,
497
- )
498
- . run ( ) ;
499
- }
492
+ )
493
+ . run ( ) ;
500
494
}
501
495
502
496
#[ cargo_test]
@@ -530,8 +524,7 @@ fn custom_build_env_var_rustc_linker_host_target_with_bad_host_config() {
530
524
. build ( ) ;
531
525
532
526
// build.rs should fail due to bad target linker being set
533
- if cargo_test_support:: is_nightly ( ) {
534
- p. cargo ( "build -Z target-applies-to-host -Z host-config --verbose --target" )
527
+ p. cargo ( "build -Z target-applies-to-host -Z host-config --verbose --target" )
535
528
. arg ( & target)
536
529
. masquerade_as_nightly_cargo ( )
537
530
. with_status ( 101 )
@@ -543,7 +536,6 @@ fn custom_build_env_var_rustc_linker_host_target_with_bad_host_config() {
543
536
"
544
537
)
545
538
. run ( ) ;
546
- }
547
539
}
548
540
549
541
#[ cargo_test]
@@ -576,8 +568,7 @@ fn custom_build_env_var_rustc_linker_bad_host() {
576
568
. build ( ) ;
577
569
578
570
// build.rs should fail due to bad host linker being set
579
- if cargo_test_support:: is_nightly ( ) {
580
- p. cargo ( "build -Z target-applies-to-host -Z host-config --verbose --target" )
571
+ p. cargo ( "build -Z target-applies-to-host -Z host-config --verbose --target" )
581
572
. arg ( & target)
582
573
. masquerade_as_nightly_cargo ( )
583
574
. with_status ( 101 )
@@ -589,7 +580,6 @@ fn custom_build_env_var_rustc_linker_bad_host() {
589
580
"
590
581
)
591
582
. run ( ) ;
592
- }
593
583
}
594
584
595
585
#[ cargo_test]
@@ -624,8 +614,7 @@ fn custom_build_env_var_rustc_linker_bad_host_with_arch() {
624
614
. build ( ) ;
625
615
626
616
// build.rs should fail due to bad host linker being set
627
- if cargo_test_support:: is_nightly ( ) {
628
- p. cargo ( "build -Z target-applies-to-host -Z host-config --verbose --target" )
617
+ p. cargo ( "build -Z target-applies-to-host -Z host-config --verbose --target" )
629
618
. arg ( & target)
630
619
. masquerade_as_nightly_cargo ( )
631
620
. with_status ( 101 )
@@ -637,7 +626,6 @@ fn custom_build_env_var_rustc_linker_bad_host_with_arch() {
637
626
"
638
627
)
639
628
. run ( ) ;
640
- }
641
629
}
642
630
643
631
#[ cargo_test]
@@ -671,12 +659,10 @@ fn custom_build_env_var_rustc_linker_cross_arch_host() {
671
659
. build ( ) ;
672
660
673
661
// build.rs should fail due to bad host linker being set
674
- if cargo_test_support:: is_nightly ( ) {
675
- p. cargo ( "build -Z target-applies-to-host -Z host-config --verbose --target" )
676
- . arg ( & target)
677
- . masquerade_as_nightly_cargo ( )
678
- . run ( ) ;
679
- }
662
+ p. cargo ( "build -Z target-applies-to-host -Z host-config --verbose --target" )
663
+ . arg ( & target)
664
+ . masquerade_as_nightly_cargo ( )
665
+ . run ( ) ;
680
666
}
681
667
682
668
#[ cargo_test]
@@ -712,8 +698,7 @@ fn custom_build_env_var_rustc_linker_bad_cross_arch_host() {
712
698
. build ( ) ;
713
699
714
700
// build.rs should fail due to bad host linker being set
715
- if cargo_test_support:: is_nightly ( ) {
716
- p. cargo ( "build -Z target-applies-to-host -Z host-config --verbose --target" )
701
+ p. cargo ( "build -Z target-applies-to-host -Z host-config --verbose --target" )
717
702
. arg ( & target)
718
703
. masquerade_as_nightly_cargo ( )
719
704
. with_status ( 101 )
@@ -725,7 +710,6 @@ fn custom_build_env_var_rustc_linker_bad_cross_arch_host() {
725
710
"
726
711
)
727
712
. run ( ) ;
728
- }
729
713
}
730
714
731
715
#[ cargo_test]
0 commit comments