瀏覽代碼

Fix Mac tests

Marcin Krzyzanowski 5 年之前
父節點
當前提交
f8c358495c

+ 3 - 4
CryptoSwift.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	archiveVersion = 1;
 	classes = {
 	classes = {
 	};
 	};
-	objectVersion = 48;
+	objectVersion = 52;
 	objects = {
 	objects = {
 
 
 /* Begin PBXBuildFile section */
 /* Begin PBXBuildFile section */
@@ -968,6 +968,7 @@
 		};
 		};
 		7564F0622072EB5D00CA5A96 /* PBXTargetDependency */ = {
 		7564F0622072EB5D00CA5A96 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			isa = PBXTargetDependency;
+			platformFilter = ios;
 			target = 75211F91207249D8004E41F8 /* CryptoSwift-TestHostApp */;
 			target = 75211F91207249D8004E41F8 /* CryptoSwift-TestHostApp */;
 			targetProxy = 7564F0612072EB5D00CA5A96 /* PBXContainerItemProxy */;
 			targetProxy = 7564F0612072EB5D00CA5A96 /* PBXContainerItemProxy */;
 		};
 		};
@@ -988,6 +989,7 @@
 		};
 		};
 		75F9482220BDDF9900956311 /* PBXTargetDependency */ = {
 		75F9482220BDDF9900956311 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			isa = PBXTargetDependency;
+			platformFilter = ios;
 			target = 75211F91207249D8004E41F8 /* CryptoSwift-TestHostApp */;
 			target = 75211F91207249D8004E41F8 /* CryptoSwift-TestHostApp */;
 			targetProxy = 75F9482120BDDF9900956311 /* PBXContainerItemProxy */;
 			targetProxy = 75F9482120BDDF9900956311 /* PBXContainerItemProxy */;
 		};
 		};
@@ -1058,7 +1060,6 @@
 			buildSettings = {
 			buildSettings = {
 				INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
 				INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
 				SDKROOT = iphoneos;
 				SDKROOT = iphoneos;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CryptoSwift-TestHostApp.app/CryptoSwift-TestHostApp";
 			};
 			};
 			name = Debug;
 			name = Debug;
 		};
 		};
@@ -1067,7 +1068,6 @@
 			buildSettings = {
 			buildSettings = {
 				INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
 				INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
 				SDKROOT = iphoneos;
 				SDKROOT = iphoneos;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CryptoSwift-TestHostApp.app/CryptoSwift-TestHostApp";
 			};
 			};
 			name = Release;
 			name = Release;
 		};
 		};
@@ -1077,7 +1077,6 @@
 			buildSettings = {
 			buildSettings = {
 				INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
 				INFOPLIST_FILE = Tests/TestsPerformance/Info.plist;
 				SDKROOT = iphoneos;
 				SDKROOT = iphoneos;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CryptoSwift-TestHostApp.app/CryptoSwift-TestHostApp";
 			};
 			};
 			name = Test;
 			name = Test;
 		};
 		};

+ 2 - 6
CryptoSwift.xcodeproj/xcshareddata/xcschemes/CryptoSwift-TestHostApp.xcscheme

@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
       <MacroExpansion>
          <BuildableReference
          <BuildableReference
             BuildableIdentifier = "primary"
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:CryptoSwift.xcodeproj">
             ReferencedContainer = "container:CryptoSwift.xcodeproj">
          </BuildableReference>
          </BuildableReference>
       </MacroExpansion>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    </TestAction>
    <LaunchAction
    <LaunchAction
       buildConfiguration = "Test"
       buildConfiguration = "Test"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:CryptoSwift.xcodeproj">
             ReferencedContainer = "container:CryptoSwift.xcodeproj">
          </BuildableReference>
          </BuildableReference>
       </BuildableProductRunnable>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    </LaunchAction>
    <ProfileAction
    <ProfileAction
       buildConfiguration = "Release"
       buildConfiguration = "Release"

+ 28 - 20
CryptoSwift.xcodeproj/xcshareddata/xcschemes/CryptoSwift.xcscheme

@@ -34,6 +34,34 @@
                ReferencedContainer = "container:CryptoSwift.xcodeproj">
                ReferencedContainer = "container:CryptoSwift.xcodeproj">
             </BuildableReference>
             </BuildableReference>
          </BuildActionEntry>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7595C1492072E48C00EA1A5F"
+               BuildableName = "TestsPerformance-Mac.xctest"
+               BlueprintName = "TestsPerformance-Mac"
+               ReferencedContainer = "container:CryptoSwift.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7564F04E2072EAEB00CA5A96"
+               BuildableName = "TestsPerformance-iOS.xctest"
+               BlueprintName = "TestsPerformance-iOS"
+               ReferencedContainer = "container:CryptoSwift.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
       </BuildActionEntries>
    </BuildAction>
    </BuildAction>
    <TestAction
    <TestAction
@@ -64,26 +92,6 @@
                ReferencedContainer = "container:CryptoSwift.xcodeproj">
                ReferencedContainer = "container:CryptoSwift.xcodeproj">
             </BuildableReference>
             </BuildableReference>
          </TestableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7595C1492072E48C00EA1A5F"
-               BuildableName = "TestsPerformance-Mac.xctest"
-               BlueprintName = "TestsPerformance-Mac"
-               ReferencedContainer = "container:CryptoSwift.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7564F04E2072EAEB00CA5A96"
-               BuildableName = "TestsPerformance-iOS.xctest"
-               BlueprintName = "TestsPerformance-iOS"
-               ReferencedContainer = "container:CryptoSwift.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       </Testables>
    </TestAction>
    </TestAction>
    <LaunchAction
    <LaunchAction