From 3c5cdf19430c744b86d275f59c83478bafb137f0 Mon Sep 17 00:00:00 2001
From: Alexander Shalamov <alexander.shalamov@mapbox.com>
Date: Mon, 2 Sep 2019 21:12:57 +0300
Subject: [build] Enable mbgl-expression-test on CI

---
 Makefile   |  1 -
 circle.yml | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

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
 
 # ------------------------------------------------------------------------------
-- 
cgit v1.2.1