summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt3
m---------mapbox-gl-js0
-rw-r--r--package.json1
-rwxr-xr-xplatform/node/scripts/after_script.sh2
-rw-r--r--platform/node/test/query.test.js2
-rw-r--r--platform/node/test/render.test.js2
-rw-r--r--platform/node/test/suite_implementation.js2
7 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41df0f2a12..1fcbb6c360 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,9 @@ if(NOT EXISTS "mapbox-gl-js/package.json")
execute_process(
COMMAND git submodule update --init mapbox-gl-js
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+ execute_process(
+ COMMAND npm install
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/mapbox-gl-js)
endif()
include(.mason/mason.cmake)
diff --git a/mapbox-gl-js b/mapbox-gl-js
-Subproject caf8f57673a6f0b12cada7a27b0b55efaa96779
+Subproject 878008895104b67861ce73f65809f7f6f0ed726
diff --git a/package.json b/package.json
index aafa36babe..953a98f29a 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
"express": "^4.11.1",
"lodash": "^4.16.4",
"mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#49e8b407bdbbe6f7c92dbcb56d3d51f425fc2653",
- "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#9ab19437e6a5272f1dfd7aaf12a7b5bbec208895",
"mkdirp": "^0.5.1",
"node-cmake": "^1.2.1",
"pixelmatch": "^4.0.2",
diff --git a/platform/node/scripts/after_script.sh b/platform/node/scripts/after_script.sh
index 4228d13dfe..beb8d6966f 100755
--- a/platform/node/scripts/after_script.sh
+++ b/platform/node/scripts/after_script.sh
@@ -6,7 +6,7 @@ set -o pipefail
JOB=$1
if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
- gzip --stdout node_modules/mapbox-gl-test-suite/render-tests/index.html | \
+ gzip --stdout mapbox-gl-js/test/integration/render-tests/index.html | \
aws s3 cp --acl public-read --content-encoding gzip --content-type text/html \
- s3://mapbox/mapbox-gl-native/render-tests/$JOB/index.html
diff --git a/platform/node/test/query.test.js b/platform/node/test/query.test.js
index 1309c03467..8125f1c7cd 100644
--- a/platform/node/test/query.test.js
+++ b/platform/node/test/query.test.js
@@ -1,6 +1,6 @@
'use strict';
-var suite = require('mapbox-gl-test-suite').query;
+var suite = require('../../../mapbox-gl-js/test/integration').query;
var suiteImplementation = require('./suite_implementation');
var tests;
diff --git a/platform/node/test/render.test.js b/platform/node/test/render.test.js
index 0527a19070..e2e13534c9 100644
--- a/platform/node/test/render.test.js
+++ b/platform/node/test/render.test.js
@@ -1,6 +1,6 @@
'use strict';
-var suite = require('mapbox-gl-test-suite').render;
+var suite = require('../../../mapbox-gl-js/test/integration').render;
var suiteImplementation = require('./suite_implementation');
var tests;
diff --git a/platform/node/test/suite_implementation.js b/platform/node/test/suite_implementation.js
index 55d7c64d2a..6648757a98 100644
--- a/platform/node/test/suite_implementation.js
+++ b/platform/node/test/suite_implementation.js
@@ -69,7 +69,7 @@ module.exports = function (style, options, callback) {
});
} else if (operation[0] === 'addImage') {
- var img = PNG.sync.read(fs.readFileSync(path.join(__dirname, '../../../node_modules', 'mapbox-gl-test-suite', operation[2])));
+ var img = PNG.sync.read(fs.readFileSync(path.join(__dirname, '../../../mapbox-gl-js/test/integration', operation[2])));
map.addImage(operation[1], img.data, {
height: img.height,