[build] fix various CI builds

Author: kkaefer

.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
 

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

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