diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-04-14 14:39:41 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-04-16 22:46:24 -0700 |
| commit | 20b1c19b638ad487561fc1432419908d965d0027 (patch) | |
| tree | b120b00134baf544dfbb129b6c21a34dc1de0356 | |
| parent | be8f83770d0a86e15ff395958b970cd69ab9c2d7 (diff) | |
| download | qtlocation-mapboxgl-20b1c19b638ad487561fc1432419908d965d0027.tar.gz | |
[ios] Run SDK tests on CI
Added SDK tests to make test-ios rule. Disabled code coverage.
5 files changed, 12 insertions, 8 deletions
@@ -56,6 +56,11 @@ iproj: $(IOS_PROJ_PATH) open $(IOS_WORK_PATH) test-ios: ios + set -o pipefail && xcodebuild \ + ARCHS=i386 ONLY_ACTIVE_ARCH=YES \ + -configuration $(BUILDTYPE) -sdk iphonesimulator \ + -destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \ + -workspace $(IOS_WORK_PATH) -scheme CI test | xcpretty ios-sim start ios-sim launch build/ios-all/$(BUILDTYPE)-iphonesimulator/ios-test.app --verbose diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 59bcce4f92..31d662f0db 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -422,7 +422,7 @@ DA1DC94C1CB6C1C2006E619F /* Demo App */, DABCABA91CB80692000A7C39 /* Benchmarking App */, DA8847D31CBAF91600AB86E3 /* SDK */, - DA2E88521CC036F400F24E7B /* test */, + DA2E88521CC036F400F24E7B /* SDK Tests */, DA1DC9921CB6DF24006E619F /* Frameworks */, DAC07C951CBB2CAD000CB309 /* Configuration */, DA1DC94B1CB6C1C2006E619F /* Products */, @@ -489,7 +489,7 @@ name = Frameworks; sourceTree = "<group>"; }; - DA2E88521CC036F400F24E7B /* test */ = { + DA2E88521CC036F400F24E7B /* SDK Tests */ = { isa = PBXGroup; children = ( DA2E885C1CC0382C00F24E7B /* MGLGeometryTests.mm */, @@ -499,6 +499,7 @@ DA2E88601CC0382C00F24E7B /* MGLStyleTests.mm */, DA2E88551CC036F400F24E7B /* Info.plist */, ); + name = "SDK Tests"; path = test; sourceTree = "<group>"; }; @@ -1443,6 +1444,7 @@ DA2E885B1CC036F400F24E7B /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; DA8847DD1CBAF91600AB86E3 /* Build configuration list for PBXNativeTarget "dynamic" */ = { isa = XCConfigurationList; diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme index 9b9169b0c4..b22ae3c001 100644 --- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme @@ -54,8 +54,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - codeCoverageEnabled = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> <TestableReference skipped = "NO"> diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic+static.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic+static.xcscheme index 2a6de91944..4b50564e54 100644 --- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic+static.xcscheme +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic+static.xcscheme @@ -54,8 +54,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - codeCoverageEnabled = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> <TestableReference skipped = "NO"> diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme index 38794b6c7e..b77beb34aa 100644 --- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme @@ -40,8 +40,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - codeCoverageEnabled = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES"> <Testables> <TestableReference skipped = "NO"> |