summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
-rw-r--r--.travis.yml1
-rwxr-xr-xscripts/compare_images.sh6
-rwxr-xr-xscripts/travis_install_test_suite.sh9
-rwxr-xr-xscripts/travis_script.sh16
-rw-r--r--test/fixtures/fixture_request.cpp2
-rw-r--r--test/headless.cpp2
m---------test/suite0
8 files changed, 20 insertions, 20 deletions
diff --git a/.gitmodules b/.gitmodules
index a1359e7398..850e0c7e2b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
[submodule "ios/mapbox-gl-cocoa"]
path = ios/mapbox-gl-cocoa
url = https://github.com/mapbox/mapbox-gl-cocoa.git
+
+[submodule "test/suite"]
+ path = test/suite
+ url = https://github.com/mapbox/mapbox-gl-test-suite.git
diff --git a/.travis.yml b/.travis.yml
index 065856d605..6336eae025 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,6 @@ before_install:
install:
- make config.gypi
-- ./scripts/travis_install_test_suite.sh
- ulimit -c
before_script:
diff --git a/scripts/compare_images.sh b/scripts/compare_images.sh
new file mode 100755
index 0000000000..4329478fb2
--- /dev/null
+++ b/scripts/compare_images.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+(cd ./test/suite/ && (./bin/compare_images.js || true))
diff --git a/scripts/travis_install_test_suite.sh b/scripts/travis_install_test_suite.sh
deleted file mode 100755
index cb2422d70c..0000000000
--- a/scripts/travis_install_test_suite.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
- #
- # we'll need the test suite on Linux
- #
- mapbox_time "install_test_suite" \
- npm install git+https://github.com/mapbox/mapbox-gl-test-suite.git
-fi
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index 5fa5a3f5f3..c224617314 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -13,16 +13,18 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
mapbox_time "compile_tests" \
make test -j$JOBS BUILDTYPE=${BUILDTYPE}
+ mapbox_time "checkout_test_suite" \
+ git submodule update --init test/suite
+
mapbox_time "run_tests" \
./scripts/run_tests.sh
- mapbox_time_start "compare_results"
- (cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true))
- mapbox_time_finish
+ mapbox_time "compare_results" \
+ ./scripts/compare_images.sh
if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
mapbox_time_start "deploy_results"
- (cd ./node_modules/mapbox-gl-test-suite/ && ./bin/deploy_results.sh)
+ (cd ./test/suite/ && ./bin/deploy_results.sh)
mapbox_time_finish
fi
@@ -39,10 +41,8 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
#
# build iOS
#
- git submodule init
-
- mapbox_time "load_submodules" \
- git submodule update
+ mapbox_time "checkout_cocoa_bindings" \
+ git submodule update --init ios/mapbox-gl-cocoa
mapbox_time "create_ios_project" \
make build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj
diff --git a/test/fixtures/fixture_request.cpp b/test/fixtures/fixture_request.cpp
index f3b41681a6..cc01760ae1 100644
--- a/test/fixtures/fixture_request.cpp
+++ b/test/fixtures/fixture_request.cpp
@@ -16,7 +16,7 @@ const std::string base_directory = []{
fn.erase(fn.find_last_of("/"));
fn.erase(fn.find_last_of("/"));
fn.erase(fn.find_last_of("/"));
- return fn + "/node_modules/mapbox-gl-test-suite/";
+ return fn + "/test/suite/";
}();
namespace mbgl {
diff --git a/test/headless.cpp b/test/headless.cpp
index e1bdbdc061..821aaa0d38 100644
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -20,7 +20,7 @@ const std::string base_directory = []{
std::string fn = __FILE__;
fn.erase(fn.find_last_of("/"));
fn.erase(fn.find_last_of("/"));
- return fn + "/node_modules/mapbox-gl-test-suite/";
+ return fn + "/test/suite/";
}();
auto display_ = std::make_shared<mbgl::HeadlessDisplay>();
diff --git a/test/suite b/test/suite
new file mode 160000
+Subproject b4db0dc1dc904a17d23f99c26f0a045afcfbdb2