summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2023-08-18 12:37:10 +0200
committerAndrej Mihajlov <and@mullvad.net>2023-08-18 12:37:10 +0200
commit4f3c7d757a0f49d69dd3f064974dbde3c309ef3a (patch)
treef4b16e27dfea38cd7f5777fe65796d0cb5a3dd19
parent163391e558a896367d128aa0e3c26b8026e55575 (diff)
parentcf99a3f75f74686b0f0e466474504010817706dd (diff)
downloadmullvadvpn-4f3c7d757a0f49d69dd3f064974dbde3c309ef3a.tar.xz
mullvadvpn-4f3c7d757a0f49d69dd3f064974dbde3c309ef3a.zip
Merge branch 'gh-actions-test-plan-ios-274'
-rw-r--r--.github/workflows/ios.yml22
-rw-r--r--ios/MullvadVPN.xcodeproj/project.pbxproj15
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadREST.xcscheme13
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadTransport.xcscheme74
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme11
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNTests.xcscheme11
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/Operations.xcscheme11
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/OperationsTests.xcscheme11
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/PacketTunnel.xcscheme21
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/RelaySelector.xcscheme13
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelObfuscation.xcscheme74
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelObfuscationTests.xcscheme12
-rw-r--r--ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelProviderMessaging.xcscheme13
-rw-r--r--ios/TestPlans/MullvadVPNApp.xctestplan1
-rw-r--r--ios/TestPlans/MullvadVPNCI.xctestplan9
15 files changed, 263 insertions, 48 deletions
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index c5cf334673..fa4f93680b 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -74,12 +74,18 @@ jobs:
cp Screenshots.xcconfig.template Screenshots.xcconfig
working-directory: ios/Configurations
+ - name: Install xcbeautify
+ run: |
+ brew update
+ brew install xcbeautify
+
- name: Run tests
- uses: sersoft-gmbh/xcodebuild-action@v2
- with:
- project: ios/MullvadVPN.xcodeproj
- scheme: MullvadVPN
- skip-testing: MullvadVPNScreenshots
- destination: platform=iOS Simulator,OS=16.4,name=iPhone 14
- action: test
- cloned-source-packages-path: ios/${{ env.SOURCE_PACKAGES_PATH }}
+ run: |
+ NSUnbufferedIO=YES set -o pipefail && \
+ xcodebuild -project MullvadVPN.xcodeproj \
+ -scheme MullvadVPN \
+ -testPlan MullvadVPNCI \
+ -destination "platform=iOS Simulator,OS=16.4,name=iPhone 14" \
+ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \
+ test 2>&1 | xcbeautify
+ working-directory: ios/
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
index b018f4102e..415298d98f 100644
--- a/ios/MullvadVPN.xcodeproj/project.pbxproj
+++ b/ios/MullvadVPN.xcodeproj/project.pbxproj
@@ -281,7 +281,6 @@
58C7A45A2A863FDD0060C66F /* WgAdapterDeviceInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 582403142A821FB000163DE8 /* WgAdapterDeviceInfo.swift */; };
58C7A45B2A8640030060C66F /* PacketTunnelPathObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58225D272A84F23B0083D7F1 /* PacketTunnelPathObserver.swift */; };
58C7A45C2A8640490060C66F /* MullvadLogging.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58D223F3294C8FF00029F5F8 /* MullvadLogging.framework */; platformFilter = ios; };
- 58C7A45D2A8640490060C66F /* MullvadLogging.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 58D223F3294C8FF00029F5F8 /* MullvadLogging.framework */; platformFilter = ios; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
58C7A4692A8643A90060C66F /* IPv4Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 58218E1428B65058000C624F /* IPv4Header.h */; settings = {ATTRIBUTES = (Public, ); }; };
58C7A46A2A8643A90060C66F /* ICMPHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 58218E1628B65396000C624F /* ICMPHeader.h */; settings = {ATTRIBUTES = (Public, ); }; };
58C7A4702A8649ED0060C66F /* PingerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58C7A46F2A8649ED0060C66F /* PingerTests.swift */; };
@@ -864,17 +863,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 58C7A4602A8640490060C66F /* Embed Frameworks */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 10;
- files = (
- 58C7A45D2A8640490060C66F /* MullvadLogging.framework in Embed Frameworks */,
- );
- name = "Embed Frameworks";
- runOnlyForDeploymentPostprocessing = 0;
- };
58CE5E85224146470008646E /* Embed Foundation Extensions */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -2798,7 +2786,6 @@
58C7A4322A863F440060C66F /* Sources */,
58C7A4332A863F440060C66F /* Frameworks */,
58C7A4342A863F440060C66F /* Resources */,
- 58C7A4602A8640490060C66F /* Embed Frameworks */,
);
buildRules = (
);
@@ -4463,6 +4450,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5808273928487E3E006B77A4 /* Base.xcconfig */;
buildSettings = {
+ APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CURRENT_PROJECT_VERSION = 1;
@@ -4500,6 +4488,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 5808273928487E3E006B77A4 /* Base.xcconfig */;
buildSettings = {
+ APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CURRENT_PROJECT_VERSION = 1;
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadREST.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadREST.xcscheme
index 9bd9800cb9..6f3701be4c 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadREST.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadREST.xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
- version = "1.3">
+ version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -27,8 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
- <Testables>
- </Testables>
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadTransport.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadTransport.xcscheme
new file mode 100644
index 0000000000..ede26eb6d4
--- /dev/null
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadTransport.xcscheme
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1430"
+ version = "1.7">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "A97F1F402A1F4E1A00ECEFDE"
+ BuildableName = "MullvadTransport.framework"
+ BlueprintName = "MullvadTransport"
+ ReferencedContainer = "container:MullvadVPN.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "A97F1F402A1F4E1A00ECEFDE"
+ BuildableName = "MullvadTransport.framework"
+ BlueprintName = "MullvadTransport"
+ ReferencedContainer = "container:MullvadVPN.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme
index c77955bd65..820babc78b 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNScreenshots.xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
- version = "1.3">
+ version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -28,6 +28,15 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
systemAttachmentLifetime = "keepNever">
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
<Testables>
<TestableReference
skipped = "NO">
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNTests.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNTests.xcscheme
index 1dbcf335c2..a5d976ec07 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNTests.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/MullvadVPNTests.xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
- version = "1.3">
+ version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
<Testables>
<TestableReference
skipped = "NO">
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/Operations.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/Operations.xcscheme
index 04d47193c8..7c357f9c76 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/Operations.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/Operations.xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
- version = "1.3">
+ version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
<Testables>
<TestableReference
skipped = "NO"
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/OperationsTests.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/OperationsTests.xcscheme
index c01b65b3a4..0348fc11b5 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/OperationsTests.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/OperationsTests.xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
- version = "1.3">
+ version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -11,6 +11,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
<Testables>
<TestableReference
skipped = "NO"
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/PacketTunnel.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/PacketTunnel.xcscheme
index 65cd6bf8ef..8f0330bdf1 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/PacketTunnel.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/PacketTunnel.xcscheme
@@ -42,18 +42,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
- <Testables>
- <TestableReference
- skipped = "NO">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "58D0C79223F1CE7000FE9BA7"
- BuildableName = "MullvadVPNScreenshots.xctest"
- BlueprintName = "MullvadVPNScreenshots"
- ReferencedContainer = "container:MullvadVPN.xcodeproj">
- </BuildableReference>
- </TestableReference>
- </Testables>
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/RelaySelector.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/RelaySelector.xcscheme
index 5088b59e92..cb72f06a28 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/RelaySelector.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/RelaySelector.xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
- version = "1.3">
+ version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -27,8 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
- <Testables>
- </Testables>
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelObfuscation.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelObfuscation.xcscheme
new file mode 100644
index 0000000000..4c04f633b6
--- /dev/null
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelObfuscation.xcscheme
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1430"
+ version = "1.7">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "5840231E2A406BF5007B27AC"
+ BuildableName = "TunnelObfuscation.framework"
+ BlueprintName = "TunnelObfuscation"
+ ReferencedContainer = "container:MullvadVPN.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "5840231E2A406BF5007B27AC"
+ BuildableName = "TunnelObfuscation.framework"
+ BlueprintName = "TunnelObfuscation"
+ ReferencedContainer = "container:MullvadVPN.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelObfuscationTests.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelObfuscationTests.xcscheme
index be288d68ea..66f6b43195 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelObfuscationTests.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelObfuscationTests.xcscheme
@@ -10,8 +10,16 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- shouldAutocreateTestPlan = "YES">
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
<Testables>
<TestableReference
skipped = "NO"
diff --git a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelProviderMessaging.xcscheme b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelProviderMessaging.xcscheme
index 7d84f7184e..a41f0a8179 100644
--- a/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelProviderMessaging.xcscheme
+++ b/ios/MullvadVPN.xcodeproj/xcshareddata/xcschemes/TunnelProviderMessaging.xcscheme
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
- version = "1.3">
+ version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -27,8 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
- <Testables>
- </Testables>
+ <TestPlans>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNApp.xctestplan"
+ default = "YES">
+ </TestPlanReference>
+ <TestPlanReference
+ reference = "container:TestPlans/MullvadVPNCI.xctestplan">
+ </TestPlanReference>
+ </TestPlans>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
diff --git a/ios/TestPlans/MullvadVPNApp.xctestplan b/ios/TestPlans/MullvadVPNApp.xctestplan
index 72cc666962..f0f5d461f0 100644
--- a/ios/TestPlans/MullvadVPNApp.xctestplan
+++ b/ios/TestPlans/MullvadVPNApp.xctestplan
@@ -50,6 +50,7 @@
}
},
{
+ "parallelizable" : true,
"target" : {
"containerPath" : "container:MullvadVPN.xcodeproj",
"identifier" : "58C7A43C2A863F450060C66F",
diff --git a/ios/TestPlans/MullvadVPNCI.xctestplan b/ios/TestPlans/MullvadVPNCI.xctestplan
index c5e374b7ff..cc3dc95a4e 100644
--- a/ios/TestPlans/MullvadVPNCI.xctestplan
+++ b/ios/TestPlans/MullvadVPNCI.xctestplan
@@ -18,6 +18,7 @@
},
"testTargets" : [
{
+ "enabled" : false,
"target" : {
"containerPath" : "container:MullvadVPN.xcodeproj",
"identifier" : "58D0C79223F1CE7000FE9BA7",
@@ -55,6 +56,14 @@
"identifier" : "589A455128E094B300565204",
"name" : "OperationsTests"
}
+ },
+ {
+ "parallelizable" : true,
+ "target" : {
+ "containerPath" : "container:MullvadVPN.xcodeproj",
+ "identifier" : "58C7A43C2A863F450060C66F",
+ "name" : "PacketTunnelCoreTests"
+ }
}
],
"version" : 1