Merge branch 'master' into 1266-slippy

.gitignore

@@ -16,6 +16,7 @@
 /test/build
 /test/node_modules
 /test/fixtures/*/*_actual.*
+/test/fixtures/database/*.db
 /include/mbgl/shader/shaders.hpp
 /src/shader/shaders_gl.cpp
 /src/shader/shaders_gles2.cpp

.gitmodules

@@ -12,7 +12,7 @@
 
 [submodule "test/ios/KIF"]
 	path = test/ios/KIF
-	url = https://github.com/mapbox/KIF.git
+	url = https://github.com/kif-framework/KIF.git
 
 [submodule "platform/ios/vendor/SMCalloutView"]
 	path = platform/ios/vendor/SMCalloutView

.travis.yml

@@ -1,95 +1,99 @@
-language: cpp
+language: android
+
+sudo: false
 
 matrix:
   exclude:
     - os: linux
   include:
     - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v7 TESTMUNK=yes
-      compiler: clang
-    - os: linux
-      env: CONFIG=debug MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v7 TESTMUNK=no
-      compiler: clang
-    - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v5 TESTMUNK=no
-      compiler: clang
+      env: FLAVOR=linux CXX=g++-4.8 BUILDTYPE=Release
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'gdb', 'g++-4.8', 'gcc-4.8', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
     - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=arm-v8 TESTMUNK=no
-      compiler: clang
+      env: FLAVOR=linux CXX=clang++ BUILDTYPE=Debug
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'gdb', 'libgcc-4.8-dev', 'libstdc++-4.8-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
     - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=x86 TESTMUNK=no
-      compiler: clang
+      env: FLAVOR=linux CXX=clang++ BUILDTYPE=Release
+      addons:
+        apt:
+          sources: [ 'ubuntu-toolchain-r-test' ]
+          packages: [ 'gdb', 'libgcc-4.8-dev', 'libstdc++-4.8-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
+    - os: osx
+      env: FLAVOR=osx BUILDTYPE=Debug
+    - os: osx
+      env: FLAVOR=ios BUILDTYPE=Release
     - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=mips TESTMUNK=no
-      compiler: clang
+      env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Release
+      android:
+        components: [ 'build-tools-22.0.0', 'android-22', 'extra' ]
+      addons:
+        apt:
+          packages: [ 'lib32stdc++6' ]
     - os: linux
-      env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=mips-64 TESTMUNK=no
-      compiler: clang
+      env: FLAVOR=android ANDROID_ABI=arm-v7 BUILDTYPE=Debug
+      android:
+        components: [ 'build-tools-22.0.0', 'android-22', 'extra' ]
+      addons:
+        apt:
+          packages: [ 'lib32stdc++6' ]
     - os: linux
-      env: BUILDTYPE=Release JOBS=16
-      compiler: clang
+      env: FLAVOR=android ANDROID_ABI=arm-v8 BUILDTYPE=Release
+      android:
+        components: [ 'build-tools-22.0.0', 'android-22', 'extra' ]
+      addons:
+        apt:
+          packages: [ 'lib32stdc++6' ]
     - os: linux
-      env: BUILDTYPE=Debug JOBS=16
-      compiler: clang
+      env: FLAVOR=android ANDROID_ABI=x86 BUILDTYPE=Release
+      android:
+        components: [ 'build-tools-22.0.0', 'android-22', 'extra' ]
+      addons:
+        apt:
+          packages: [ 'lib32stdc++6' ]
     - os: linux
-      env: BUILDTYPE=Release JOBS=8
-      compiler: gcc
-    - os: osx
-      env: BUILDTYPE=Debug JOBS=8 MASON_PLATFORM=osx
-      compiler: clang
-    - os: osx
-      env: BUILDTYPE=Release JOBS=8 MASON_PLATFORM=ios
-      compiler: clang
+      env: FLAVOR=android ANDROID_ABI=mips BUILDTYPE=Release
+      android:
+        components: [ 'build-tools-22.0.0', 'android-22', 'extra' ]
+      addons:
+        apt:
+          packages: [ 'lib32stdc++6' ]
 
 env:
   global:
-   - secure: "MZHblLZXG/jWf2w0ZFlxCLDwx2qtGgRDODQyg1BR7JIuMz6AtWv8XR/sUczWLbiABCL0a/NzJF1g4v2pI7X69IntcjOdIABBgTh7++6+1TJ0Kp8viEltb55nQG3lHy/R6fOaI7Pj9tuCX0PCRtGA5C/fGnodLGEjy3RVOJ09ln0="
-   - secure: "KaSQbhgjtV7ZCkesHmvrNsbQVjk5SPfGKB1VkWenRGYhLF45HpSRNwSxMQddZ566Pg7qIFgF1iWl/B0QW3B6AWL5WmzQ5AOJgwS876pNIc/UT7ubMPtgAtjpvw1bQvQP3B8MrB+3OE5c6tD+a3LhR9krV//dOsfErR5Yy+3Mbkc="
-   - ANDROID_BUILD_INSTANCE_PROFILE: arn:aws:iam::234858372212:instance-profile/android-gl-build/travis/instance-profile/travis-mapbox-gl-native-AndroidInstanceProfile-13EA815DD8IQ9
-   - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I="
-   - secure: "CHBiUM60TolDbQnn+4IRA/tvOKwKs3g9EDvv8YHSJMg3FuHmjKQkprBasvxf3hnTXg4WLZEubmeDcyJ6RRzPP5mMSr/hksYl0pSjj/6TUecE5fHPVVeN7txVqkpOBf9i45Y+iBUQMjBb1NnDK3pHXxpnAs1Q/pe7vReErj4GF1U="
-   - LD_LIBRARY_PATH: '/usr/local/lib'
-   - TERM: dumb
-   # begin iOS code signing
-   - secure: "I6Iu75X1E+js5tzijtKi1EGtIuBcA4/25nDYe0svV4HAtujY71ZJZ4eB6355CKhFXpLXrF3i7eKVX3v+zWS0QROPEWacgsqsvNg+Ba9cnznW/faUSOYekCfhzWd/6reYDM7KzKAQwSUHLk9JIWK/kkmi4r+vVJK7h+tjPllK5YA="
-   - IOS_APP_NAME="Mapbox GL"
-   - 'IOS_DEVELOPER_NAME="iPhone Distribution: Mapbox, Inc."'
-   - IOS_PROFILE_NAME="ios-in-house"
-   - secure: "nQqSM8rd7OHtV4MqmNqVnkrVHqxKqQsaWRYk4/nPdhbeVWtTtkk0df711LrF1TUtbEPEewHxYUvTZ/UXmwJNeoKdzTHavI8hnatRkgjyxGERPn1il1Otelht9I+LQQHf+plrpRjVWBrNIW0Zox1B3cqn6d3NglpbXrEQ2EjYGNA="
-   # end iOS code signing
-
-before_install:
-- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then sudo service mysql stop; fi
-- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then sudo service postgresql stop; fi
-- source ./scripts/local_mason.sh
-- source ./scripts/travis_helper.sh
-- source ./scripts/install_node.sh
-- source ./scripts/flags.sh
-- ./scripts/travis_before_install.sh
-- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.4.3`/lib; fi
-- if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then glxinfo; fi
+    - TERM: dumb
+    # AWS
+    - secure: "MZHblLZXG/jWf2w0ZFlxCLDwx2qtGgRDODQyg1BR7JIuMz6AtWv8XR/sUczWLbiABCL0a/NzJF1g4v2pI7X69IntcjOdIABBgTh7++6+1TJ0Kp8viEltb55nQG3lHy/R6fOaI7Pj9tuCX0PCRtGA5C/fGnodLGEjy3RVOJ09ln0="
+    - secure: "KaSQbhgjtV7ZCkesHmvrNsbQVjk5SPfGKB1VkWenRGYhLF45HpSRNwSxMQddZ566Pg7qIFgF1iWl/B0QW3B6AWL5WmzQ5AOJgwS876pNIc/UT7ubMPtgAtjpvw1bQvQP3B8MrB+3OE5c6tD+a3LhR9krV//dOsfErR5Yy+3Mbkc="
+    # Access Token
+    - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I="
+    # Testmunk
+    - secure: "CHBiUM60TolDbQnn+4IRA/tvOKwKs3g9EDvv8YHSJMg3FuHmjKQkprBasvxf3hnTXg4WLZEubmeDcyJ6RRzPP5mMSr/hksYl0pSjj/6TUecE5fHPVVeN7txVqkpOBf9i45Y+iBUQMjBb1NnDK3pHXxpnAs1Q/pe7vReErj4GF1U="
+    # iOS code signing
+    - secure: "I6Iu75X1E+js5tzijtKi1EGtIuBcA4/25nDYe0svV4HAtujY71ZJZ4eB6355CKhFXpLXrF3i7eKVX3v+zWS0QROPEWacgsqsvNg+Ba9cnznW/faUSOYekCfhzWd/6reYDM7KzKAQwSUHLk9JIWK/kkmi4r+vVJK7h+tjPllK5YA="
+    - IOS_APP_NAME="Mapbox GL"
+    - 'IOS_DEVELOPER_NAME="iPhone Distribution: Mapbox, Inc."'
+    - IOS_PROFILE_NAME="ios-in-house"
+    - secure: "nQqSM8rd7OHtV4MqmNqVnkrVHqxKqQsaWRYk4/nPdhbeVWtTtkk0df711LrF1TUtbEPEewHxYUvTZ/UXmwJNeoKdzTHavI8hnatRkgjyxGERPn1il1Otelht9I+LQQHf+plrpRjVWBrNIW0Zox1B3cqn6d3NglpbXrEQ2EjYGNA="
+    - KIF_SCREENSHOTS="${TRAVIS_BUILD_DIR}/screenshots"
 
 install:
-- ulimit -c
-
-before_script:
- # Set the core file limit to unlimited so a core file is generated upon crash
- - ulimit -c unlimited -S
- # begin iOS code signing
- - openssl aes-256-cbc -k "$IOS_ENCRYPTION_SECRET" -in scripts/ios_travis/ios-in-house.mobileprovision.enc -d -a -out scripts/ios_travis/ios-in-house.mobileprovision
- - openssl aes-256-cbc -k "$IOS_ENCRYPTION_SECRET" -in scripts/ios_travis/ios-dist.cer.enc                 -d -a -out scripts/ios_travis/ios-dist.cer
- - openssl aes-256-cbc -k "$IOS_ENCRYPTION_SECRET" -in scripts/ios_travis/ios-dist.p12.enc                 -d -a -out scripts/ios_travis/ios-dist.p12
- - ./scripts/ios_travis/add-key.sh
- # end iOS code signing
+- ./scripts/${FLAVOR}/install.sh
 
 script:
-- ./scripts/travis_script.sh
+- ./scripts/${FLAVOR}/run.sh
 
-after_script:
-- ./scripts/ios_travis/remove-key.sh
+after_failure:
+- "[ -f scripts/${FLAVOR}/run.sh ] && scripts/${FLAVOR}/run.sh"
 
 notifications:
   slack:
     secure: HHQYr7sF8M1SzoWSqgKVYtwAgGdLLCyTMsQjFhEEQNYO92ZwURE5s03qWTGH5k8+4Yqn26yrXt3NztLC4JIOpcGervN2mSZyq4dZgFTcWEd61igw0qwSenlwvFfbE1ASK/KYCzfyn9MIfHN+ovwLoRxXZkPwinKDvl3DXjBaFNg=
+
 git:
   submodules: false