From 163fc3c11350e714978b3f06daac5df931828152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Tue, 26 Jul 2016 14:47:14 +0200
Subject: [build] fix various CI builds

---
 .travis.yml                | 3 +--
 docker/linux/test.sh       | 2 +-
 platform/macos/bitrise.yml | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df06cd4e2d..b36c9eefa7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ before_script:
   - cmake --version
 script:
   - make linux
-  - make test-linux
+  - make test
 after_script:
   - ccache --show-stats
   - ./platform/linux/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} ${TRAVIS_TAG:-}
@@ -151,7 +151,6 @@ cache:
   directories:
     - $HOME/.ccache
     - $HOME/.cache/pip
-    - .mason
     - node_modules
     - mason_packages/.binaries
 
diff --git a/docker/linux/test.sh b/docker/linux/test.sh
index 21632daa18..207f7679cf 100755
--- a/docker/linux/test.sh
+++ b/docker/linux/test.sh
@@ -21,4 +21,4 @@ source ./scripts/travis_helper.sh
 source ./scripts/travis_setup.sh
 
 make linux
-make test-linux
+make test
diff --git a/platform/macos/bitrise.yml b/platform/macos/bitrise.yml
index 0987049437..3b0eca3efd 100644
--- a/platform/macos/bitrise.yml
+++ b/platform/macos/bitrise.yml
@@ -33,7 +33,7 @@ workflows:
             gem install xcpretty --no-rdoc --no-ri
             export BUILDTYPE=Debug
             make macos
-            make test-macos
+            make test
         - is_debug: 'yes'
     - slack:
         title: Post to Slack
-- 
cgit v1.2.1