diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-09 13:09:17 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-10-12 07:35:13 +0300 |
| commit | 2726f9b8aefd1e3e10baa38a10f37599f61638b0 (patch) | |
| tree | 40daf40da006d58be2afc0486f61e77a53cdb5d6 | |
| parent | 3c22b14479e200b0339131b033471d59dc7dda9a (diff) | |
| download | qtlocation-mapboxgl-2726f9b8aefd1e3e10baa38a10f37599f61638b0.tar.gz | |
[macos] Merge mbgl-{test,benchmark} into CI scheme
| -rw-r--r-- | platform/macos/bitrise.yml | 25 | ||||
| -rw-r--r-- | platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme | 28 |
2 files changed, 30 insertions, 23 deletions
diff --git a/platform/macos/bitrise.yml b/platform/macos/bitrise.yml index 193356f0da..340d72e27c 100644 --- a/platform/macos/bitrise.yml +++ b/platform/macos/bitrise.yml @@ -43,28 +43,7 @@ workflows: make xproj - is_debug: 'yes' - script: - title: Build Benchmark Tests - run_if: '{{enveq "SKIPCI" "false"}}' - inputs: - - content: |- - #!/bin/bash - set -eu -o pipefail - export BUILDTYPE=Debug - make benchmark - - is_debug: 'yes' - - script: - title: Run Core Tests - run_if: '{{enveq "SKIPCI" "false"}}' - inputs: - - content: |- - #!/bin/bash - set -eu -o pipefail - export BUILDTYPE=Debug - make test - make run-test - - is_debug: 'yes' - - script: - title: Run SDK Unit Tests + title: Run Core and SDK Unit Tests run_if: '{{enveq "SKIPCI" "false"}}' inputs: - content: |- @@ -72,7 +51,7 @@ workflows: set -eu -o pipefail export BUILDTYPE=Debug export XCPRETTY="| tee ${BITRISE_DEPLOY_DIR}/raw-xcodebuild-output.txt | xcpretty --color --report html --output ${BITRISE_DEPLOY_DIR}/xcode-test-results.html" - make macos-test + make run-test - is_debug: 'yes' - deploy-to-bitrise-io: title: Deploy to Bitrise.io diff --git a/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme index 3cc2afa46c..eca3be86dc 100644 --- a/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme +++ b/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme @@ -48,6 +48,34 @@ ReferencedContainer = "container:macos.xcodeproj"> </BuildableReference> </BuildActionEntry> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "8E8A234D3E364CDFA2918983" + BuildableName = "mbgl-test" + BlueprintName = "mbgl-test" + ReferencedContainer = "container:../../build/macos/mbgl.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + <BuildActionEntry + buildForTesting = "NO" + buildForRunning = "NO" + buildForProfiling = "NO" + buildForArchiving = "NO" + buildForAnalyzing = "NO"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "11FCEF1E29744645907C1E4B" + BuildableName = "mbgl-benchmark" + BlueprintName = "mbgl-benchmark" + ReferencedContainer = "container:../../build/macos/mbgl.xcodeproj"> + </BuildableReference> + </BuildActionEntry> </BuildActionEntries> </BuildAction> <TestAction |