Skip to content

Commit 920035a

Browse files
swift-ciswift-ci
authored
Merge pull request #1564 from spevans/pr_bundle_xdgtesthelper
2 parents 9ecb4fa + 18a49af commit 920035a

File tree

6 files changed

+75
-131
lines changed

6 files changed

+75
-131
lines changed

‎DarwinCompatibilityTests.xcodeproj/project.pbxproj

Lines changed: 26 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
B917D32620B0DE2000728EE0 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = B917D32520B0DE2000728EE0 /* main.swift */; };
1313
B95788861F6FB9470003EB01 /* TestNSNumberBridging.swift in Sources */ = {isa = PBXBuildFile; fileRef = B95788851F6FB9470003EB01 /* TestNSNumberBridging.swift */; };
1414
B987C65E2093C8AF0026B50D /* TestImports.swift in Sources */ = {isa = PBXBuildFile; fileRef = B987C65D2093C8AF0026B50D /* TestImports.swift */; };
15-
B9C89ED21F6BF67C00087AF4 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9C89ED11F6BF67C00087AF4 /* XCTest.framework */; };
1615
B9C89F361F6BF89C00087AF4 /* TestScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9C89EE61F6BF88F00087AF4 /* TestScanner.swift */; };
1716
B9C89F371F6BF89C00087AF4 /* TestNSValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9C89EE71F6BF88F00087AF4 /* TestNSValue.swift */; };
1817
B9C89F381F6BF89C00087AF4 /* TestUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9C89EE81F6BF88F00087AF4 /* TestUtils.swift */; };
@@ -110,10 +109,20 @@
110109
B9C89FCC1F6DCAEB00087AF4 /* NSKeyedUnarchiver-NotificationTest.plist in Resources */ = {isa = PBXBuildFile; fileRef = B9C89FB71F6DCAEB00087AF4 /* NSKeyedUnarchiver-NotificationTest.plist */; };
111110
B9C89FCD1F6DCAEB00087AF4 /* PropertyList-1.0.dtd in Resources */ = {isa = PBXBuildFile; fileRef = B9C89FB81F6DCAEB00087AF4 /* PropertyList-1.0.dtd */; };
112111
B9C89FCE1F6DCAEB00087AF4 /* Test.plist in Resources */ = {isa = PBXBuildFile; fileRef = B9C89FB91F6DCAEB00087AF4 /* Test.plist */; };
113-
B9F3269F1FC714DD003C3599 /* DarwinShims.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9F3269E1FC714DD003C3599 /* DarwinShims.swift */; };
112+
B9F137A120B998D0000B7577 /* xdgTestHelper in CopyFiles */ = {isa = PBXBuildFile; fileRef = B917D31C20B0DB8B00728EE0 /* xdgTestHelper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
114113
B9F326A01FC714DD003C3599 /* DarwinShims.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9F3269E1FC714DD003C3599 /* DarwinShims.swift */; };
115114
/* End PBXBuildFile section */
116115

116+
/* Begin PBXContainerItemProxy section */
117+
B9F1379E20B9984F000B7577 /* PBXContainerItemProxy */ = {
118+
isa = PBXContainerItemProxy;
119+
containerPortal = B9C89EB91F6BF47D00087AF4 /* Project object */;
120+
proxyType = 1;
121+
remoteGlobalIDString = B917D31B20B0DB8B00728EE0;
122+
remoteInfo = xdgTestHelper;
123+
};
124+
/* End PBXContainerItemProxy section */
125+
117126
/* Begin PBXCopyFilesBuildPhase section */
118127
B917D31A20B0DB8B00728EE0 /* CopyFiles */ = {
119128
isa = PBXCopyFilesBuildPhase;
@@ -124,12 +133,13 @@
124133
);
125134
runOnlyForDeploymentPostprocessing = 1;
126135
};
127-
B9C89EBF1F6BF47D00087AF4 /* CopyFiles */ = {
136+
B9F137A020B998C0000B7577 /* CopyFiles */ = {
128137
isa = PBXCopyFilesBuildPhase;
129-
buildActionMask = 12;
130-
dstPath = usr/share/man/man1;
131-
dstSubfolderSpec = 7;
138+
buildActionMask = 2147483647;
139+
dstPath = "";
140+
dstSubfolderSpec = 6;
132141
files = (
142+
B9F137A120B998D0000B7577 /* xdgTestHelper in CopyFiles */,
133143
);
134144
runOnlyForDeploymentPostprocessing = 0;
135145
};
@@ -142,7 +152,6 @@
142152
B917D32520B0DE2000728EE0 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = main.swift; path = TestFoundation/xdgTestHelper/main.swift; sourceTree = "<group>"; };
143153
B95788851F6FB9470003EB01 /* TestNSNumberBridging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TestNSNumberBridging.swift; path = TestFoundation/TestNSNumberBridging.swift; sourceTree = "<group>"; };
144154
B987C65D2093C8AF0026B50D /* TestImports.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TestImports.swift; path = TestFoundation/TestImports.swift; sourceTree = "<group>"; };
145-
B9C89EC11F6BF47D00087AF4 /* DarwinCompatibilityTests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DarwinCompatibilityTests; sourceTree = BUILT_PRODUCTS_DIR; };
146155
B9C89ED11F6BF67C00087AF4 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
147156
B9C89ED71F6BF77E00087AF4 /* DarwinCompatibilityTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DarwinCompatibilityTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
148157
B9C89EDB1F6BF77E00087AF4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -257,14 +266,6 @@
257266
);
258267
runOnlyForDeploymentPostprocessing = 0;
259268
};
260-
B9C89EBE1F6BF47D00087AF4 /* Frameworks */ = {
261-
isa = PBXFrameworksBuildPhase;
262-
buildActionMask = 2147483647;
263-
files = (
264-
B9C89ED21F6BF67C00087AF4 /* XCTest.framework in Frameworks */,
265-
);
266-
runOnlyForDeploymentPostprocessing = 0;
267-
};
268269
B9C89ED41F6BF77E00087AF4 /* Frameworks */ = {
269270
isa = PBXFrameworksBuildPhase;
270271
buildActionMask = 2147483647;
@@ -397,7 +398,6 @@
397398
B9C89EC21F6BF47D00087AF4 /* Products */ = {
398399
isa = PBXGroup;
399400
children = (
400-
B9C89EC11F6BF47D00087AF4 /* DarwinCompatibilityTests */,
401401
B9C89ED71F6BF77E00087AF4 /* DarwinCompatibilityTests.xctest */,
402402
B917D31C20B0DB8B00728EE0 /* xdgTestHelper */,
403403
);
@@ -443,34 +443,19 @@
443443
productReference = B917D31C20B0DB8B00728EE0 /* xdgTestHelper */;
444444
productType = "com.apple.product-type.tool";
445445
};
446-
B9C89EC01F6BF47D00087AF4 /* DarwinCompatibilityTests */ = {
447-
isa = PBXNativeTarget;
448-
buildConfigurationList = B9C89EC81F6BF47D00087AF4 /* Build configuration list for PBXNativeTarget "DarwinCompatibilityTests" */;
449-
buildPhases = (
450-
B9C89EBD1F6BF47D00087AF4 /* Sources */,
451-
B9C89EBE1F6BF47D00087AF4 /* Frameworks */,
452-
B9C89EBF1F6BF47D00087AF4 /* CopyFiles */,
453-
);
454-
buildRules = (
455-
);
456-
dependencies = (
457-
);
458-
name = DarwinCompatibilityTests;
459-
productName = DarwinCompatibilityTests;
460-
productReference = B9C89EC11F6BF47D00087AF4 /* DarwinCompatibilityTests */;
461-
productType = "com.apple.product-type.tool";
462-
};
463446
B9C89ED61F6BF77E00087AF4 /* DarwinCompatibilityTests */ = {
464447
isa = PBXNativeTarget;
465448
buildConfigurationList = B9C89EDC1F6BF77E00087AF4 /* Build configuration list for PBXNativeTarget "DarwinCompatibilityTests" */;
466449
buildPhases = (
467450
B9C89ED31F6BF77E00087AF4 /* Sources */,
468451
B9C89ED41F6BF77E00087AF4 /* Frameworks */,
469452
B9C89ED51F6BF77E00087AF4 /* Resources */,
453+
B9F137A020B998C0000B7577 /* CopyFiles */,
470454
);
471455
buildRules = (
472456
);
473457
dependencies = (
458+
B9F1379F20B9984F000B7577 /* PBXTargetDependency */,
474459
);
475460
name = DarwinCompatibilityTests;
476461
productName = DarwinCompatibilityTests;
@@ -491,11 +476,6 @@
491476
CreatedOnToolsVersion = 9.3.1;
492477
ProvisioningStyle = Automatic;
493478
};
494-
B9C89EC01F6BF47D00087AF4 = {
495-
CreatedOnToolsVersion = 9.0;
496-
LastSwiftMigration = 0910;
497-
ProvisioningStyle = Automatic;
498-
};
499479
B9C89ED61F6BF77E00087AF4 = {
500480
CreatedOnToolsVersion = 9.0;
501481
ProvisioningStyle = Automatic;
@@ -514,7 +494,6 @@
514494
projectDirPath = "";
515495
projectRoot = "";
516496
targets = (
517-
B9C89EC01F6BF47D00087AF4 /* DarwinCompatibilityTests */,
518497
B9C89ED61F6BF77E00087AF4 /* DarwinCompatibilityTests */,
519498
B917D31B20B0DB8B00728EE0 /* xdgTestHelper */,
520499
);
@@ -562,14 +541,6 @@
562541
);
563542
runOnlyForDeploymentPostprocessing = 0;
564543
};
565-
B9C89EBD1F6BF47D00087AF4 /* Sources */ = {
566-
isa = PBXSourcesBuildPhase;
567-
buildActionMask = 2147483647;
568-
files = (
569-
B9F3269F1FC714DD003C3599 /* DarwinShims.swift in Sources */,
570-
);
571-
runOnlyForDeploymentPostprocessing = 0;
572-
};
573544
B9C89ED31F6BF77E00087AF4 /* Sources */ = {
574545
isa = PBXSourcesBuildPhase;
575546
buildActionMask = 2147483647;
@@ -658,6 +629,14 @@
658629
};
659630
/* End PBXSourcesBuildPhase section */
660631

632+
/* Begin PBXTargetDependency section */
633+
B9F1379F20B9984F000B7577 /* PBXTargetDependency */ = {
634+
isa = PBXTargetDependency;
635+
target = B917D31B20B0DB8B00728EE0 /* xdgTestHelper */;
636+
targetProxy = B9F1379E20B9984F000B7577 /* PBXContainerItemProxy */;
637+
};
638+
/* End PBXTargetDependency section */
639+
661640
/* Begin XCBuildConfiguration section */
662641
B917D32020B0DB8B00728EE0 /* Debug */ = {
663642
isa = XCBuildConfiguration;
@@ -793,34 +772,6 @@
793772
};
794773
name = Release;
795774
};
796-
B9C89EC91F6BF47D00087AF4 /* Debug */ = {
797-
isa = XCBuildConfiguration;
798-
buildSettings = {
799-
CLANG_ENABLE_MODULES = YES;
800-
CODE_SIGN_STYLE = Automatic;
801-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
802-
MACOSX_DEPLOYMENT_TARGET = 10.13;
803-
OTHER_SWIFT_FLAGS = "";
804-
"OTHER_SWIFT_FLAGS[arch=*]" = "";
805-
PRODUCT_NAME = "$(TARGET_NAME)";
806-
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
807-
SWIFT_VERSION = 4.0;
808-
};
809-
name = Debug;
810-
};
811-
B9C89ECA1F6BF47D00087AF4 /* Release */ = {
812-
isa = XCBuildConfiguration;
813-
buildSettings = {
814-
CLANG_ENABLE_MODULES = YES;
815-
CODE_SIGN_STYLE = Automatic;
816-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
817-
MACOSX_DEPLOYMENT_TARGET = 10.13;
818-
OTHER_SWIFT_FLAGS = "";
819-
PRODUCT_NAME = "$(TARGET_NAME)";
820-
SWIFT_VERSION = 4.0;
821-
};
822-
name = Release;
823-
};
824775
B9C89EDD1F6BF77E00087AF4 /* Debug */ = {
825776
isa = XCBuildConfiguration;
826777
buildSettings = {
@@ -870,15 +821,6 @@
870821
defaultConfigurationIsVisible = 0;
871822
defaultConfigurationName = Release;
872823
};
873-
B9C89EC81F6BF47D00087AF4 /* Build configuration list for PBXNativeTarget "DarwinCompatibilityTests" */ = {
874-
isa = XCConfigurationList;
875-
buildConfigurations = (
876-
B9C89EC91F6BF47D00087AF4 /* Debug */,
877-
B9C89ECA1F6BF47D00087AF4 /* Release */,
878-
);
879-
defaultConfigurationIsVisible = 0;
880-
defaultConfigurationName = Release;
881-
};
882824
B9C89EDC1F6BF77E00087AF4 /* Build configuration list for PBXNativeTarget "DarwinCompatibilityTests" */ = {
883825
isa = XCConfigurationList;
884826
buildConfigurations = (

‎Foundation.xcodeproj/project.pbxproj

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
B9974B9A1EDF4A22007F15B8 /* HTTPMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9974B931EDF4A22007F15B8 /* HTTPMessage.swift */; };
345345
B9974B9B1EDF4A22007F15B8 /* BodySource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9974B941EDF4A22007F15B8 /* BodySource.swift */; };
346346
B9974B9C1EDF4A22007F15B8 /* EasyHandle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B9974B951EDF4A22007F15B8 /* EasyHandle.swift */; };
347+
B9F1379A20B99455000B7577 /* xdgTestHelper in CopyFiles */ = {isa = PBXBuildFile; fileRef = B9F1379920B99455000B7577 /* xdgTestHelper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
347348
BB3D7558208A1E500085CFDC /* TestImports.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB3D7557208A1E500085CFDC /* TestImports.swift */; };
348349
BD8042161E09857800487EB8 /* TestLengthFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD8042151E09857800487EB8 /* TestLengthFormatter.swift */; };
349350
BDBB65901E256BFA001A7286 /* TestEnergyFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDBB658F1E256BFA001A7286 /* TestEnergyFormatter.swift */; };
@@ -456,6 +457,13 @@
456457
remoteGlobalIDString = 5B5D885C1BBC938800234F36;
457458
remoteInfo = SwiftFoundation;
458459
};
460+
B9F1379620B99357000B7577 /* PBXContainerItemProxy */ = {
461+
isa = PBXContainerItemProxy;
462+
containerPortal = 5B5D88541BBC938800234F36 /* Project object */;
463+
proxyType = 1;
464+
remoteGlobalIDString = 9F0DD33E1ECD734200F68030;
465+
remoteInfo = xdgTestHelper;
466+
};
459467
EA993CE21BEACD8E000969A2 /* PBXContainerItemProxy */ = {
460468
isa = PBXContainerItemProxy;
461469
containerPortal = 5B5D88541BBC938800234F36 /* Project object */;
@@ -486,6 +494,16 @@
486494
);
487495
runOnlyForDeploymentPostprocessing = 0;
488496
};
497+
B9F1379820B99363000B7577 /* CopyFiles */ = {
498+
isa = PBXCopyFilesBuildPhase;
499+
buildActionMask = 2147483647;
500+
dstPath = "";
501+
dstSubfolderSpec = 6;
502+
files = (
503+
B9F1379A20B99455000B7577 /* xdgTestHelper in CopyFiles */,
504+
);
505+
runOnlyForDeploymentPostprocessing = 0;
506+
};
489507
EA66F66D1BF56CCB00136161 /* CopyFiles */ = {
490508
isa = PBXCopyFilesBuildPhase;
491509
buildActionMask = 2147483647;
@@ -826,6 +844,7 @@
826844
B9974B931EDF4A22007F15B8 /* HTTPMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HTTPMessage.swift; path = http/HTTPMessage.swift; sourceTree = "<group>"; };
827845
B9974B941EDF4A22007F15B8 /* BodySource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BodySource.swift; sourceTree = "<group>"; };
828846
B9974B951EDF4A22007F15B8 /* EasyHandle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EasyHandle.swift; sourceTree = "<group>"; };
847+
B9F1379920B99455000B7577 /* xdgTestHelper */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = xdgTestHelper; path = DerivedData/Foundation/Build/Products/Debug/xdgTestHelper.app/Contents/MacOS/xdgTestHelper; sourceTree = "<group>"; };
829848
BB3D7557208A1E500085CFDC /* TestImports.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestImports.swift; sourceTree = "<group>"; };
830849
BD8042151E09857800487EB8 /* TestLengthFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestLengthFormatter.swift; sourceTree = "<group>"; };
831850
BDBB658F1E256BFA001A7286 /* TestEnergyFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestEnergyFormatter.swift; sourceTree = "<group>"; };
@@ -1037,6 +1056,7 @@
10371056
5B5D88531BBC938800234F36 = {
10381057
isa = PBXGroup;
10391058
children = (
1059+
B9F1379920B99455000B7577 /* xdgTestHelper */,
10401060
B167A6641ED7303F0040B09A /* README.md */,
10411061
5BDC3F2C1BCC5DB500ED97BB /* Foundation */,
10421062
EAB57B681BD1A255004AC5C5 /* CoreFoundation */,
@@ -2022,10 +2042,12 @@
20222042
5BDC40591BD6D83B00ED97BB /* Frameworks */,
20232043
5BDC405A1BD6D83B00ED97BB /* Resources */,
20242044
5BDC406D1BD6D8B300ED97BB /* CopyFiles */,
2045+
B9F1379820B99363000B7577 /* CopyFiles */,
20252046
);
20262047
buildRules = (
20272048
);
20282049
dependencies = (
2050+
B9F1379720B99357000B7577 /* PBXTargetDependency */,
20292051
AE2FC5951CFEFC70008F7981 /* PBXTargetDependency */,
20302052
);
20312053
name = TestFoundation;
@@ -2541,6 +2563,11 @@
25412563
target = 5B5D885C1BBC938800234F36 /* SwiftFoundation */;
25422564
targetProxy = AE2FC5941CFEFC70008F7981 /* PBXContainerItemProxy */;
25432565
};
2566+
B9F1379720B99357000B7577 /* PBXTargetDependency */ = {
2567+
isa = PBXTargetDependency;
2568+
target = 9F0DD33E1ECD734200F68030 /* xdgTestHelper */;
2569+
targetProxy = B9F1379620B99357000B7577 /* PBXContainerItemProxy */;
2570+
};
25442571
EA993CE31BEACD8E000969A2 /* PBXTargetDependency */ = {
25452572
isa = PBXTargetDependency;
25462573
target = 5B7C8A6D1BEA7F8F00C5B690 /* CoreFoundation */;
@@ -2672,11 +2699,7 @@
26722699
INFOPLIST_FILE = Foundation/Info.plist;
26732700
INIT_ROUTINE = "___CFInitialize";
26742701
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2675-
LD_RUNPATH_SEARCH_PATHS = (
2676-
"$(inherited)",
2677-
"@executable_path/../Frameworks",
2678-
"@loader_path/Frameworks",
2679-
);
2702+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
26802703
OTHER_CFLAGS = (
26812704
"-DCF_BUILDING_CF",
26822705
"-DDEPLOYMENT_TARGET_MACOSX",
@@ -2748,11 +2771,7 @@
27482771
INFOPLIST_FILE = Foundation/Info.plist;
27492772
INIT_ROUTINE = "___CFInitialize";
27502773
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
2751-
LD_RUNPATH_SEARCH_PATHS = (
2752-
"$(inherited)",
2753-
"@executable_path/../Frameworks",
2754-
"@loader_path/Frameworks",
2755-
);
2774+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
27562775
OTHER_CFLAGS = (
27572776
"-DCF_BUILDING_CF",
27582777
"-DDEPLOYMENT_TARGET_MACOSX",
@@ -2900,11 +2919,7 @@
29002919
/usr/include/libxml2,
29012920
);
29022921
INFOPLIST_FILE = TestFoundation/Resources/Info.plist;
2903-
LD_RUNPATH_SEARCH_PATHS = (
2904-
"$(inherited)",
2905-
"@executable_path/../Frameworks",
2906-
"@loader_path/../Frameworks",
2907-
);
2922+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
29082923
LIBRARY_SEARCH_PATHS = "$(inherited)";
29092924
MACH_O_TYPE = mh_execute;
29102925
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 4";
@@ -2930,11 +2945,7 @@
29302945
/usr/include/libxml2,
29312946
);
29322947
INFOPLIST_FILE = TestFoundation/Resources/Info.plist;
2933-
LD_RUNPATH_SEARCH_PATHS = (
2934-
"$(inherited)",
2935-
"@executable_path/../Frameworks",
2936-
"@loader_path/../Frameworks",
2937-
);
2948+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
29382949
LIBRARY_SEARCH_PATHS = "$(inherited)";
29392950
MACH_O_TYPE = mh_execute;
29402951
OTHER_SWIFT_FLAGS = "-DDEPLOYMENT_ENABLE_LIBDISPATCH -swift-version 4";
@@ -2958,12 +2969,7 @@
29582969
CODE_SIGN_IDENTITY = "";
29592970
COMBINE_HIDPI_IMAGES = YES;
29602971
INFOPLIST_FILE = TestFoundation/xdgTestHelper/Info.plist;
2961-
LD_RUNPATH_SEARCH_PATHS = (
2962-
"$(inherited)",
2963-
"@executable_path/../../..",
2964-
"@loader_path/../../..",
2965-
"@executable_path/../Frameworks",
2966-
);
2972+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../../.. @loader_path/../../.. @executable_path/../Frameworks";
29672973
MACOSX_DEPLOYMENT_TARGET = 10.12;
29682974
PRODUCT_BUNDLE_IDENTIFIER = org.swift.xdgTestHelper;
29692975
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2985,12 +2991,7 @@
29852991
CODE_SIGN_IDENTITY = "";
29862992
COMBINE_HIDPI_IMAGES = YES;
29872993
INFOPLIST_FILE = TestFoundation/xdgTestHelper/Info.plist;
2988-
LD_RUNPATH_SEARCH_PATHS = (
2989-
"$(inherited)",
2990-
"@executable_path/../../..",
2991-
"@loader_path/../../..",
2992-
"@executable_path/../Frameworks",
2993-
);
2994+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../../.. @loader_path/../../.. @executable_path/../Frameworks";
29942995
MACOSX_DEPLOYMENT_TARGET = 10.12;
29952996
PRODUCT_BUNDLE_IDENTIFIER = org.swift.xdgTestHelper;
29962997
PRODUCT_NAME = "$(TARGET_NAME)";

‎TestFoundation/TestBundle.swift

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,10 @@ internal func testBundleName() -> String {
2828
}
2929

3030
internal func xdgTestHelperURL() -> URL {
31-
#if DARWIN_COMPATIBILITY_TESTS
32-
let exeName = "/xdgTestHelper"
33-
#elseif os(macOS)
34-
let exeName = "/xdgTestHelper.app/Contents/MacOS/xdgTestHelper"
35-
#else
36-
let exeName = "/xdgTestHelper/xdgTestHelper"
37-
#endif
38-
39-
var path = testBundle().bundleURL.deletingLastPathComponent()
40-
path.appendPathComponent(exeName)
41-
return path
31+
guard let url = testBundle().url(forAuxiliaryExecutable: "xdgTestHelper") else {
32+
fatalError("Cant find xdgTestHelper")
33+
}
34+
return url
4235
}
4336

4437

0 commit comments

Comments
 (0)