summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-09-02 21:12:57 +0300
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2019-09-04 10:37:50 +0300
commit3c5cdf19430c744b86d275f59c83478bafb137f0 (patch)
tree7252966527b1b8b10cfab3fbcddaf36ca9614c07
parent631bc4f6a3ff7518787a8a3db76b252e96198a07 (diff)
downloadqtlocation-mapboxgl-3c5cdf19430c744b86d275f59c83478bafb137f0.tar.gz
[build] Enable mbgl-expression-test on CI
-rw-r--r--Makefile1
-rw-r--r--circle.yml24
2 files changed, 24 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 51956cae6b..a212fa9b92 100644
--- a/Makefile
+++ b/Makefile
@@ -560,7 +560,6 @@ test-node: node
npm test
npm run test-query
npm run test-memory
- npm run test-expressions
#### Android targets ###########################################################
diff --git a/circle.yml b/circle.yml
index 3293de1aca..d32e206e4a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -272,6 +272,11 @@ commands:
- run:
name: Build mbgl-render-test
command: cmake --build build --config ${BUILDTYPE} --target mbgl-render-test -- -j${JOBS}
+ build-mbgl-expression-test:
+ steps:
+ - run:
+ name: Build mbgl-expression-test
+ command: cmake --build build --config ${BUILDTYPE} --target mbgl-expression-test -- -j${JOBS}
build-linux:
steps:
- run:
@@ -435,6 +440,19 @@ commands:
# Unfortunately, Google Test eats the status code, so we'll have to check the output.
[ -z "$(sed -n '/^SUMMARY: .*Sanitizer:/p' sanitizer)" ]
+ run-expression-tests:
+ steps:
+ - run:
+ name: Run expression tests
+ command: |
+ build/mbgl-expression-test -s --seed=$RANDOM
+
+ upload-expression-tests:
+ steps:
+ - store_artifacts:
+ path: mapbox-gl-js/test/integration/expression-tests/index.html
+ destination: expression-tests
+
publish-node-package:
steps:
- run:
@@ -988,9 +1006,12 @@ jobs:
- install-dependencies
- check-if-this-job-can-be-skipped
- configure-cmake
+ - build-mbgl-expression-test
- build-mbgl-render-test
+ - run-expression-tests
- run-linux-render-tests
- save-dependencies
+ - upload-expression-tests
- upload-render-tests
# ------------------------------------------------------------------------------
@@ -1272,9 +1293,12 @@ jobs:
- install-dependencies
- check-if-this-job-can-be-skipped
- configure-cmake
+ - build-mbgl-expression-test
- build-mbgl-render-test
- save-dependencies
+ - run-expression-tests
- run-macos-render-tests
+ - upload-expression-tests
- upload-render-tests
# ------------------------------------------------------------------------------