diff options
| author | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-08-06 15:16:57 +0300 |
|---|---|---|
| committer | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-08-06 15:59:12 +0300 |
| commit | e4d35d8de5035a64de68da99ab2628ebd0faa19d (patch) | |
| tree | 874a7c224667c6a3da9875da8d39cae613f3e9c8 | |
| parent | 131ce55ade6765e883d45a5ee2ba7d65d9aaeee0 (diff) | |
| download | qtlocation-mapboxgl-upstream/astojilj-15286.tar.gz | |
Run node render tests on macos-release bot, in addition to mbgl-render-tests run on linuxupstream/astojilj-15286
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | circle.yml | 30 |
2 files changed, 9 insertions, 28 deletions
@@ -559,6 +559,13 @@ test-node: node npm run test-query npm run test-expressions +.PHONY: test-node-all +test-node-all: node + npm test + npm run test-query + npm run test-expressions + npm run test-render + #### Android targets ########################################################### MBGL_ANDROID_ABIS = arm-v7;armeabi-v7a diff --git a/circle.yml b/circle.yml index e7d50421c4..b84df89e2c 100644 --- a/circle.yml +++ b/circle.yml @@ -54,7 +54,6 @@ workflows: branches: ignore: /.*/ - macos-debug - - macos-render-tests - qt5-linux-gcc5-release - qt5-macos-debug nightly: @@ -372,7 +371,7 @@ commands: steps: - run: name: Run node tests - command: make test-node + command: make test-node-all run-node-linux-tests: parameters: @@ -387,14 +386,6 @@ commands: xvfb-run --server-args="-screen 0 1024x768x24" \ logbt -- apitrace trace --api=egl -v make test-node - run-macos-render-tests: - steps: - - run: - name: Run render tests (mbgl-render-test) - command: | - build/mbgl-render-test --recycle-map --shuffle - no_output_timeout: 2m - run-linux-render-tests: parameters: node_version: @@ -784,6 +775,7 @@ jobs: - save-dependencies - run-node-macos-tests - publish-node-package + - upload-render-tests - collect-xcode-build-logs - upload-xcode-build-logs @@ -1178,24 +1170,6 @@ jobs: - upload-xcode-build-logs # ------------------------------------------------------------------------------ - macos-render-tests: - macos: - xcode: "10.3.0" - environment: - BUILDTYPE: RelWithDebInfo - HOMEBREW_NO_AUTO_UPDATE: 1 - HOMEBREW_NO_INSTALL_CLEANUP: 1 - JOBS: 2 - steps: - - install-macos-dependencies - - install-dependencies - - configure-cmake - - build-mbgl-render-test - - save-dependencies - - run-macos-render-tests - - upload-render-tests - -# ------------------------------------------------------------------------------ qt5-linux-gcc5-release: docker: - image: mbgl/linux-gcc-5-qt-5.9:5132cfd29f |