APT dependencies moved from Makefile to .travis.yml
diff --git a/.travis.yml b/.travis.yml
index 22271cd..f980c97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,27 +19,59 @@
# Standard Ubuntu 12.04 LTS Server Edition 64 bit
- os: linux
sudo: required
- 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"
+ env: PLATFORM="Ubuntu 12.04" CMD="make gpptest && make clean && make gnu90test && make clean && make c99test && make clean && make gnu99test && make clean && make clangtest"
+ addons:
+ apt:
+ packages:
+ - libc6-dev-i386
+ - g++-multilib
- os: linux
sudo: required
- env: PLATFORM="Ubuntu 12.04" CMD="make arminstall armtest"
+ env: PLATFORM="Ubuntu 12.04" CMD="make armtest"
+ addons:
+ apt:
+ packages:
+ - gcc-arm-linux-gnueabi
+ - libc6-dev-armel-cross
+ - linux-libc-dev-armel-cross
- os: linux
sudo: required
- env: PLATFORM="Ubuntu 12.04" CMD="make libc6install && make -C programs test32"
+ env: PLATFORM="Ubuntu 12.04" CMD="make -C programs test32"
+ addons:
+ apt:
+ packages:
+ - libc6-dev-i386
- os: linux
sudo: required
env: PLATFORM="Ubuntu 12.04" CMD="make -C tests versionsTest"
- os: linux
sudo: required
- env: PLATFORM="Ubuntu 12.04" CMD="make libc6install asan32"
+ env: PLATFORM="Ubuntu 12.04" CMD="make asan32"
+ addons:
+ apt:
+ packages:
+ - libc6-dev-i386
- os: linux
sudo: required
- env: PLATFORM="Ubuntu 12.04" CMD="make valgrindinstall && make -C programs valgrindTest"
+ env: PLATFORM="Ubuntu 12.04" CMD="make -C programs valgrindTest"
+ addons:
+ apt:
+ packages:
+ - valgrind
# Ubuntu 14.04 LTS Server Edition 64 bit
- os: linux
dist: trusty
sudo: required
- env: PLATFORM="Ubuntu 14.04" CMD="make zlibwrapper && make clean && make gcc5install gcc5test && make clean && make gcc6install gcc6test && make clean && make ppcinstall ppctest"
+ env: PLATFORM="Ubuntu 14.04" CMD="make zlibwrapper && make clean && make gcc5test && make clean && make gcc6test && make clean && make ppcinstall ppctest"
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-5-multilib
+ - gcc-6-multilib
+ - qemu-system-ppc
+ - gcc-powerpc-linux-gnu
# OS X Mavericks
- os: osx
env: PLATFORM="OS X Mavericks" CMD="make gnu90test && make clean && make test && make clean && make travis-install"
diff --git a/Makefile b/Makefile
index 6e83f33..32f063f 100644
--- a/Makefile
+++ b/Makefile
@@ -174,37 +174,3 @@
staticAnalyze: clean
CPPFLAGS=-g scan-build --status-bugs -v $(MAKE) all
endif
-
-
-#------------------------------------------------------------------------
-# for Travis CI
-#------------------------------------------------------------------------
-libc6install:
- sudo apt-get install -y -qq libc6-dev-i386
-
-gppinstall:
- sudo apt-get install -y -qq g++-multilib
-
-gcc5install:
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -y -qq
- sudo apt-get install -y -qq gcc-5-multilib
-
-gcc6install:
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -y -qq
- sudo apt-get install -y -qq gcc-6-multilib
-
-arminstall: clean
- sudo apt-get install -y -q qemu binfmt-support qemu-user-static gcc-arm-linux-gnueabi
-
-ppcinstall: clean
- sudo apt-get install -y -q qemu-system-ppc binfmt-support qemu-user-static gcc-powerpc-linux-gnu # doesn't work with Ubuntu 12.04
-
-ppc64install: clean # compilation works but cannot be executed
- sudo apt-get install -y -q qemu-system-ppc binfmt-support qemu-user-static gcc-powerpc-linux-gnu
- update-binfmts --displ
-
-valgrindinstall:
- echo sudo apt-get install -y -qq valgrind
- sudo apt-get install -y -qq valgrind