Commit 86b0ff1
authored
Include the path to the platform's PrivateFrameworks directory in DYLD_FRAMEWORK_PATH when launching test runners (#8199)
This modifies the logic which sets the value of the
`DYLD_FRAMEWORK_PATH` environment variable when launching test runners
on Darwin when Xcode is installed: currently it includes the path to the
platform's developer "Frameworks" directory, and this change adds the
sibling "PrivateFrameworks" directory as well.
### Motivation:
XCTest includes some private support frameworks, and these frameworks
must be aligned with the public framework for testing to work correctly.
This ensures that if the path to the (public) frameworks directory is
specified, the aligned private frameworks directory is also included.
### Modifications:
- Add `$PLATFORM/Developer/Library/PrivateFrameworks` to the
`DYLD_FRAMEWORK_PATH` env var.
Resolves rdar://1415641911 parent 0401a2a commit 86b0ff1
File tree
2 files changed
+29
-16
lines changed- Sources
- Commands/Utilities
- PackageModel/SwiftSDKs
2 files changed
+29
-16
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
219 | 219 | | |
220 | 220 | | |
221 | 221 | | |
222 | | - | |
223 | | - | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
224 | 228 | | |
225 | 229 | | |
226 | 230 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
582 | 582 | | |
583 | 583 | | |
584 | 584 | | |
585 | | - | |
586 | | - | |
587 | | - | |
588 | | - | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
589 | 589 | | |
590 | 590 | | |
591 | 591 | | |
| |||
617 | 617 | | |
618 | 618 | | |
619 | 619 | | |
620 | | - | |
621 | | - | |
| 620 | + | |
| 621 | + | |
622 | 622 | | |
623 | | - | |
624 | | - | |
| 623 | + | |
| 624 | + | |
625 | 625 | | |
626 | 626 | | |
627 | 627 | | |
| |||
630 | 630 | | |
631 | 631 | | |
632 | 632 | | |
633 | | - | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
634 | 640 | | |
635 | 641 | | |
636 | 642 | | |
| |||
652 | 658 | | |
653 | 659 | | |
654 | 660 | | |
655 | | - | |
656 | | - | |
| 661 | + | |
| 662 | + | |
657 | 663 | | |
658 | 664 | | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
659 | 668 | | |
660 | | - | |
661 | | - | |
| 669 | + | |
| 670 | + | |
662 | 671 | | |
663 | 672 | | |
664 | 673 | | |
665 | | - | |
| 674 | + | |
666 | 675 | | |
667 | 676 | | |
668 | 677 | | |
| |||
0 commit comments