diff options
| author | Julian Rex <julian.rex@gmail.com> | 2018-05-24 00:43:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-24 00:43:29 -0400 |
| commit | 5e65cb7812727b6c0625e4fbde538ddb5ff4ba13 (patch) | |
| tree | 1a182eea520b172d13e1c5b87d65e447902b0088 /platform/ios/ios.xcodeproj | |
| parent | 3ea1a7062ffcfd05c6e5e6fe2a9a96537ba8630a (diff) | |
| download | qtlocation-mapboxgl-5e65cb7812727b6c0625e4fbde538ddb5ff4ba13.tar.gz | |
[ios, macos] Added macro to handle pending iOS tests (rather than disabling via scheme) (#11806)
Diffstat (limited to 'platform/ios/ios.xcodeproj')
3 files changed, 11 insertions, 10 deletions
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index aef2552b0b..c0909344f3 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -1004,6 +1004,7 @@ CA4EB8C620863487006AB465 /* MGLStyleLayerIntegrationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLStyleLayerIntegrationTests.m; sourceTree = "<group>"; }; CA34C9C2207FD272005C1A06 /* MGLCameraTransitionTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLCameraTransitionTests.mm; sourceTree = "<group>"; }; CA55CD3E202C16AA00CE7095 /* MGLCameraChangeReason.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLCameraChangeReason.h; sourceTree = "<group>"; }; + CA5E5042209BDC5F001A8A81 /* MGLTestUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MGLTestUtility.h; path = ../../darwin/test/MGLTestUtility.h; sourceTree = "<group>"; }; DA00FC8C1D5EEB0D009AABC8 /* MGLAttributionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAttributionInfo.h; sourceTree = "<group>"; }; DA00FC8D1D5EEB0D009AABC8 /* MGLAttributionInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLAttributionInfo.mm; sourceTree = "<group>"; }; DA0CD58F1CF56F6A00A5F5A5 /* MGLFeatureTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLFeatureTests.mm; path = ../../darwin/test/MGLFeatureTests.mm; sourceTree = "<group>"; }; @@ -1535,6 +1536,7 @@ 4031ACFD1E9FD26900A3EA26 /* Test Helpers */ = { isa = PBXGroup; children = ( + CA5E5042209BDC5F001A8A81 /* MGLTestUtility.h */, 4031ACFE1E9FD29F00A3EA26 /* MGLSDKTestHelpers.swift */, ); name = "Test Helpers"; diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme index 01b565d5d9..6b018e1337 100644 --- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme @@ -54,7 +54,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "NO"> <Testables> <TestableReference skipped = "NO"> @@ -65,14 +65,6 @@ BlueprintName = "test" ReferencedContainer = "container:ios.xcodeproj"> </BuildableReference> - <SkippedTests> - <Test - Identifier = "MGLAnnotationViewTests/testAnnotationViewInitWithFrame"> - </Test> - <Test - Identifier = "MGLAnnotationViewTests/testSelectingADisabledAnnotationView"> - </Test> - </SkippedTests> </TestableReference> </Testables> <MacroExpansion> @@ -84,6 +76,13 @@ ReferencedContainer = "container:ios.xcodeproj"> </BuildableReference> </MacroExpansion> + <EnvironmentVariables> + <EnvironmentVariable + key = "MAPBOX_RUN_PENDING_TESTS" + value = "YES" + isEnabled = "NO"> + </EnvironmentVariable> + </EnvironmentVariables> <AdditionalOptions> </AdditionalOptions> </TestAction> diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme index 1638592557..ce264aa19a 100644 --- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme +++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme @@ -26,7 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "NO"> <Testables> <TestableReference skipped = "NO"> |