From e8e531193bc0dae71028bdd21a20e099477d6c87 Mon Sep 17 00:00:00 2001 From: inikep Date: Mon, 12 Sep 2016 14:33:23 +0200 Subject: [PATCH] .travis.yml: 32-bit clang tests switched to Ubuntu 14.04 --- .travis.yml | 54 +++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5479a974..91af96f06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,14 +27,6 @@ matrix: sudo: false env: PLATFORM="Ubuntu 12.04 container" CMD="make asan" # Standard Ubuntu 12.04 LTS Server Edition 64 bit - - os: linux - sudo: required - 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 armtest" @@ -47,25 +39,9 @@ matrix: - binfmt-support - qemu - qemu-user-static - - os: linux - sudo: required - env: PLATFORM="Ubuntu 12.04" CMD="make -C tests test32" - addons: - apt: - packages: - - libc6-dev-i386 - - gcc-multilib - 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 asan32" - addons: - apt: - packages: - - libc6-dev-i386 - - gcc-multilib - os: linux sudo: required env: PLATFORM="Ubuntu 12.04" CMD="make -C tests valgrindTest" @@ -74,6 +50,36 @@ matrix: packages: - valgrind # Ubuntu 14.04 LTS Server Edition 64 bit + - os: linux + dist: trusty + sudo: required + env: PLATFORM="Ubuntu 14.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 + dist: trusty + sudo: required + env: PLATFORM="Ubuntu 14.04" CMD="make -C tests test32" + addons: + apt: + packages: + - libc6-dev-i386 + - gcc-multilib + - os: linux + dist: trusty + sudo: required + env: PLATFORM="Ubuntu 14.04" CMD="make asan32" + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-3.8 + packages: + - clang-3.8 + - libc6-dev-i386 - os: linux dist: trusty sudo: required