@@ -521,77 +521,69 @@ tasks:
521
521
cc_common_link_ubuntu2004 :
522
522
name : Build via cc_common.link
523
523
platform : ubuntu2004
524
- working_directory : test/cc_common_link
524
+ working_directory : test/integration/cc_common_link
525
+ build_targets :
526
+ - " //..."
527
+ test_targets :
528
+ - " //..."
529
+ cc_common_link_macos :
530
+ name : Build via cc_common.link
531
+ platform : macos_arm64
532
+ working_directory : test/integration/cc_common_link
525
533
build_targets :
526
- - " --"
527
534
- " //..."
528
- # The with_global_alloc directory is a repository on its own tested in the 'Build via cc_common.link using a global allocator' task.
529
- - " -//with_global_alloc/..."
530
535
test_targets :
531
- - " --"
532
536
- " //..."
533
- # The with_global_alloc directory is a repository on its own tested in the 'Build via cc_common.link using a global allocator' task.
534
- - " -//with_global_alloc/..."
535
- build_flags :
536
- - " --@rules_rust//rust/settings:experimental_use_cc_common_link=True"
537
- test_flags :
538
- - " --@rules_rust//rust/settings:experimental_use_cc_common_link=True"
539
537
cc_common_link_with_global_alloc_ubuntu2004 :
540
538
name : Build via cc_common.link using a global allocator
541
539
platform : ubuntu2004
542
- working_directory : test/cc_common_link/with_global_alloc
540
+ working_directory : test/integration/cc_common_link_with_global_alloc
541
+ build_targets :
542
+ - " //..."
543
+ test_targets :
544
+ - " //..."
545
+ cc_common_link_with_global_alloc_macos :
546
+ name : Build via cc_common.link using a global allocator
547
+ platform : macos_arm64
548
+ working_directory : test/integration/cc_common_link_with_global_alloc
543
549
build_targets :
544
550
- " //..."
545
551
test_targets :
546
552
- " //..."
547
- build_flags :
548
- - " --@rules_rust//rust/settings:experimental_use_cc_common_link=True"
549
- - " --@rules_rust//rust/settings:experimental_use_global_allocator=True"
550
- test_flags :
551
- - " --@rules_rust//rust/settings:experimental_use_cc_common_link=True"
552
- - " --@rules_rust//rust/settings:experimental_use_global_allocator=True"
553
553
cc_common_link_no_std_ubuntu2004 :
554
554
name : Build with no_std + alloc using cc_common.link infrastructure for linking
555
555
platform : ubuntu2004
556
- working_directory : test/no_std
556
+ working_directory : test/integration/ no_std
557
557
build_targets :
558
558
- " //..."
559
559
test_targets :
560
560
- " //..."
561
561
build_flags :
562
- - " --@rules_rust//rust/toolchain/channel=nightly"
563
- - " --@rules_rust//rust/settings:experimental_use_cc_common_link=True"
564
- - " --@rules_rust//rust/settings:experimental_use_global_allocator=True"
565
- - " --@rules_rust//rust/settings:no_std=alloc"
562
+ - " --config=no_std_alloc_using_cc_common_link"
566
563
test_flags :
567
- - " --@rules_rust//rust/toolchain/channel=nightly"
568
- - " --@rules_rust//rust/settings:experimental_use_cc_common_link=True"
569
- - " --@rules_rust//rust/settings:experimental_use_global_allocator=True"
570
- - " --@rules_rust//rust/settings:no_std=alloc"
564
+ - " --config=no_std_alloc_using_cc_common_link"
571
565
no_std_ubuntu2004 :
572
566
name : Build with no_std + alloc
573
567
platform : ubuntu2004
574
- working_directory : test/no_std
568
+ working_directory : test/integration/ no_std
575
569
build_targets :
576
570
- " //..."
577
571
test_targets :
578
572
- " //..."
579
573
build_flags :
580
- - " --@rules_rust//rust/toolchain/channel=nightly"
581
- - " --@rules_rust//rust/settings:no_std=alloc"
574
+ - " --config=no_std_alloc"
582
575
test_flags :
583
- - " --@rules_rust//rust/toolchain/channel=nightly"
584
- - " --@rules_rust//rust/settings:no_std=alloc"
576
+ - " --config=no_std_alloc"
585
577
bzlmod_repo_mapping_runfiles :
586
578
name : bzlmod repo mapping test
587
579
platform : ubuntu2004
588
- working_directory : test/bzlmod_repo_mapping/module_a
580
+ working_directory : test/integration/ bzlmod_repo_mapping/module_a
589
581
test_targets :
590
582
- " //..."
591
583
aliased_toolchains :
592
584
name : aliased toolchains test
593
585
platform : ubuntu2004
594
- working_directory : test/aliased_toolchains
586
+ working_directory : test/integration/ aliased_toolchains
595
587
build_targets :
596
588
- " @rust_toolchains//:all"
597
589
- " //..."
0 commit comments