diff options
| author | Juha Alanen <juha.alanen@mapbox.com> | 2020-02-25 15:27:40 +0200 |
|---|---|---|
| committer | Juha Alanen <juha.alanen@mapbox.com> | 2020-02-25 15:31:36 +0200 |
| commit | 7a177de35cf666cde022b6e51c77145bca360dc3 (patch) | |
| tree | aed99f3e9529639a6a192ea17756ae028d7291cf | |
| parent | a3b5b2e868da50553c02c3f60a8b87fd9ab3fa73 (diff) | |
| download | qtlocation-mapboxgl-upstream/jmalanen-metal.tar.gz | |
[build][ios] Add test runner CI jobs using Metal rendererupstream/jmalanen-metal
| -rw-r--r-- | circle.yml | 27 | ||||
| -rw-r--r-- | metrics/ios-render-test-runner-metal-metrics.json | 14 | ||||
| -rw-r--r-- | metrics/ios-render-test-runner-metal-style.json | 18 |
3 files changed, 56 insertions, 3 deletions
diff --git a/circle.yml b/circle.yml index 1081e42dd2..601ba55610 100644 --- a/circle.yml +++ b/circle.yml @@ -22,6 +22,15 @@ workflows: - ios-render-test-runner - ios-unit-test-runner - ios-benchmark-runner + - ios-render-test-runner: + name: ios-render-test-runner-metal + config_params: '-DMBGL_WITH_OPENGL=OFF -DMBGL_WITH_METAL=ON' + - ios-unit-test-runner: + name: ios-unit-test-runner-metal + config_params: '-DMBGL_WITH_OPENGL=OFF -DMBGL_WITH_METAL=ON' + - ios-benchmark-runner: + name: ios-benchmark-runner-metal + config_params: '-DMBGL_WITH_OPENGL=OFF -DMBGL_WITH_METAL=ON' - baselines: requires: - android-arm64-v8a-release @@ -362,6 +371,10 @@ commands: jobs: ios-render-test-runner: + parameters: + config_params: + type: string + default: '' executor: macos-11_3_1 steps: - checkout @@ -370,7 +383,7 @@ jobs: - prepare-ios-codesign-keychain: directory: render-test/ios - config: - config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_RENDER_TEST=ON -DCMAKE_OSX_ARCHITECTURES=arm64e' + config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_RENDER_TEST=ON -DCMAKE_OSX_ARCHITECTURES=arm64e << parameters.config_params >>' - build: build_params: '--config Release' - codesign-ios-test-runner: @@ -413,6 +426,10 @@ jobs: fi - save ios-unit-test-runner: + parameters: + config_params: + type: string + default: '' executor: macos-11_3_1 steps: - checkout @@ -421,7 +438,7 @@ jobs: - prepare-ios-codesign-keychain: directory: test/ios - config: - config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_UNIT_TEST=ON -DCMAKE_OSX_ARCHITECTURES=arm64e' + config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_UNIT_TEST=ON -DCMAKE_OSX_ARCHITECTURES=arm64e << parameters.config_params >>' - build: build_params: '--config Release' - codesign-ios-test-runner: @@ -458,6 +475,10 @@ jobs: fi - save ios-benchmark-runner: + parameters: + config_params: + type: string + default: '' executor: macos-11_3_1 steps: - checkout @@ -466,7 +487,7 @@ jobs: - prepare-ios-codesign-keychain: directory: benchmark/ios - config: - config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_BENCHMARK=ON -DCMAKE_OSX_ARCHITECTURES=arm64e' + config_params: '-G Xcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DMBGL_IOS_BENCHMARK=ON -DCMAKE_OSX_ARCHITECTURES=arm64e << parameters.config_params >>' - build: build_params: '--config Release' - codesign-ios-test-runner: diff --git a/metrics/ios-render-test-runner-metal-metrics.json b/metrics/ios-render-test-runner-metal-metrics.json new file mode 100644 index 0000000000..fc0ee5332f --- /dev/null +++ b/metrics/ios-render-test-runner-metal-metrics.json @@ -0,0 +1,14 @@ +{ + "base_test_path": "tests", + "cache_path": "cache-metrics.db", + "expectation_paths": [ + "expectations/platform-all", + "expectations/platform-ios" + ], + "ignore_paths": [ + "ignores/platform-all.json", + "ignores/platform-macos.json", + "ignores/platform-ios.json" + ], + "metric_path": "ios-render-test-runner" +}
\ No newline at end of file diff --git a/metrics/ios-render-test-runner-metal-style.json b/metrics/ios-render-test-runner-metal-style.json new file mode 100644 index 0000000000..432edb11a2 --- /dev/null +++ b/metrics/ios-render-test-runner-metal-style.json @@ -0,0 +1,18 @@ +{ + "base_test_path": "integration", + "cache_path": "cache-style.db", + "expectation_paths": [ + "expectations/platform-all", + "expectations/platform-ios" + ], + "ignore_paths": [ + "ignores/platform-all.json", + "ignores/platform-macos.json", + "ignores/platform-ios.json" + ], + "metric_path": "ios-render-test-runner", + "probes": [ + "probeGFX", + "probeNetwork" + ] +}
\ No newline at end of file |