.travis.yml: 24 tests merged into 12 tests
diff --git a/.travis.yml b/.travis.yml
index 6cd3f5f..22271cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,41 +6,20 @@
# Container-based Ubuntu 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes)
- os: linux
sudo: false
- env: PLATFORM="Ubuntu 12.04 container" CMD="make travis-install"
+ env: PLATFORM="Ubuntu 12.04 container" CMD="make test && make clean && make travis-install"
- os: linux
sudo: false
- env: PLATFORM="Ubuntu 12.04 container" CMD="make cmaketest"
- - os: linux
- sudo: false
- env: PLATFORM="Ubuntu 12.04 container" CMD="make test"
- - os: linux
- sudo: false
- env: PLATFORM="Ubuntu 12.04 container" CMD="make -C programs test-zstd_nolegacy"
+ env: PLATFORM="Ubuntu 12.04 container" CMD="make -C programs test-zstd_nolegacy && make clean && make zlibwrapper && make clean && make cmaketest"
- os: linux
sudo: false
env: PLATFORM="Ubuntu 12.04 container" CMD="make usan"
- os: linux
sudo: false
env: PLATFORM="Ubuntu 12.04 container" CMD="make asan"
- - os: linux
- sudo: false
- env: PLATFORM="Ubuntu 12.04 container" CMD="make zlibwrapper"
# Standard Ubuntu 12.04 LTS Server Edition 64 bit
- os: linux
sudo: required
- env: PLATFORM="Ubuntu 12.04" CMD="make libc6install clangtest"
- - os: linux
- sudo: required
- env: PLATFORM="Ubuntu 12.04" CMD="make gppinstall gpptest"
- - os: linux
- sudo: required
- env: PLATFORM="Ubuntu 12.04" CMD="make libc6install gnu90test"
- - os: linux
- sudo: required
- env: PLATFORM="Ubuntu 12.04" CMD="make libc6install c99test"
- - os: linux
- sudo: required
- env: PLATFORM="Ubuntu 12.04" CMD="make libc6install gnu99test"
+ env: PLATFORM="Ubuntu 12.04" CMD="make gppinstall gpptest && make clean && make libc6install gnu90test && make clean && make c99test && make clean && make gnu99test && make clean && make clangtest"
- os: linux
sudo: required
env: PLATFORM="Ubuntu 12.04" CMD="make arminstall armtest"
@@ -60,26 +39,10 @@
- os: linux
dist: trusty
sudo: required
- env: PLATFORM="Ubuntu 14.04" CMD="make gcc5install gcc5test"
- - os: linux
- dist: trusty
- sudo: required
- env: PLATFORM="Ubuntu 14.04" CMD="make gcc6install gcc6test"
- - os: linux
- dist: trusty
- sudo: required
- env: PLATFORM="Ubuntu 14.04" CMD="make ppcinstall ppctest"
- - os: linux
- dist: trusty
- sudo: required
- env: PLATFORM="Ubuntu 14.04" CMD="make zlibwrapper"
+ env: PLATFORM="Ubuntu 14.04" CMD="make zlibwrapper && make clean && make gcc5install gcc5test && make clean && make gcc6install gcc6test && make clean && make ppcinstall ppctest"
# OS X Mavericks
- os: osx
- env: PLATFORM="OS X Mavericks" CMD="make travis-install"
- - os: osx
- env: PLATFORM="OS X Mavericks" CMD="make gnu90test"
- - os: osx
- env: PLATFORM="OS X Mavericks" CMD="make test"
+ env: PLATFORM="OS X Mavericks" CMD="make gnu90test && make clean && make test && make clean && make travis-install"
exclude:
- compiler: gcc