From e4d35d8de5035a64de68da99ab2628ebd0faa19d Mon Sep 17 00:00:00 2001
From: Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com>
Date: Tue, 6 Aug 2019 15:16:57 +0300
Subject: Run node render tests on macos-release bot, in addition to
 mbgl-render-tests run on linux

---
 Makefile   |  7 +++++++
 circle.yml | 30 ++----------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index 5a127471c9..b67844a548 100644
--- a/Makefile
+++ b/Makefile
@@ -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
 
@@ -1177,24 +1169,6 @@ jobs:
       - collect-xcode-build-logs
       - 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:
-- 
cgit v1.2.1