Merge branch 'master' into aws-s3-bucket

This commit is contained in:
Mike Morris
2014-08-20 17:06:00 -04:00
2 changed files with 11 additions and 5 deletions

10
scripts/run_tests.sh Executable file
View File

@@ -0,0 +1,10 @@
#!/usr/bin/env bash
set -e
set -o pipefail
cd build/Testing
for TEST in ./test_* ; do
${TEST}
done

View File

@@ -9,11 +9,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
#
make linux -j4 BUILDTYPE=${BUILDTYPE}
make test -j4 BUILDTYPE=${BUILDTYPE}
cd build/Testing
for TEST in ./test_* ; do
${TEST}
done
cd ../..
./scripts/run_tests.sh
(cd ./node_modules/mapbox-gl-test-suite/ && (./bin/compare_images.js || true; ./bin/deploy_results.sh))
elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
#