summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-07-09 12:37:59 -0700
committerKonstantin Käfer <mail@kkaefer.com>2014-07-09 12:37:59 -0700
commitd0d68d08f4be9360c5fbeedb2edd08b8e0e8d75e (patch)
tree46d0766f5b87750f00c7e8b0a093d509b9a52e5c /.travis.yml
parent5fe36a3cb055dd8be94186dfb75d5be3499956af (diff)
downloadqtlocation-mapboxgl-d0d68d08f4be9360c5fbeedb2edd08b8e0e8d75e.tar.gz
fix automated headless testing on travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml11
1 files changed, 8 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index d88fa71e8d..dddd096c86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,8 @@ env:
- secure: "Cbvap9ubVKgjPe3hUhI6JGeDZzBXHpOG9RaYKh+SdoIPhKnlJiNOYm1egomi+e4uqJInlFKuVHTw7Ng9Cun6Zm0jIxpkSchv1GpsR7hmB3UGnGed19Dw8121FwuUaktN+4YnbVlsyd+u8EHD3+h58t4eELrLrZolM4rS7DL6caA="
before_install:
-- source ./scripts/setup_travis.sh
+- ./scripts/setup_travis.sh
+- source ./scripts/flags.sh
install:
- make setup
@@ -25,8 +26,12 @@ before_script:
- rm -rf mapnik-packaging/out/packages
script:
-- make linux BUILDTYPE=${BUILDTYPE}
-- make run-tests BUILDTYPE=${BUILDTYPE}
+- make linux -j4 BUILDTYPE=${BUILDTYPE}
+- make test -j4 BUILDTYPE=${BUILDTYPE}
+- ./scripts/run_tests.sh
+
+after_script:
+- ./scripts/deploy_results.sh
notifications:
hipchat: