From 2e7908002e9dc7b89b5ee4179072a411a5ddb436 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 9 Jan 2019 16:31:14 +0000 Subject: [PATCH] travis: remove matrix settings that duplicate global settings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The global defaults request "trusty" and "gcc", so matrix entries do not need to repeat this. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39dbda7a0b..79da3a495a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,39 +128,33 @@ matrix: - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" after_success: - ${SRC_DIR}/scripts/travis/coverage-summary.sh - compiler: gcc # We manually include builds which we disable "make check" for - env: - CONFIG="--enable-debug --enable-tcg-interpreter" - TEST_CMD="" - compiler: gcc # We don't need to exercise every backend with every front-end - env: - CONFIG="--enable-trace-backends=log,simple,syslog --disable-system" - TEST_CMD="" - compiler: gcc - env: - CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu" - TEST_CMD="" - compiler: gcc - env: - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu" - TEST_CMD="" - compiler: gcc - env: - CONFIG="--disable-tcg" - TEST_CMD="" - compiler: gcc # MacOSX builds @@ -251,5 +245,3 @@ matrix: - env: - CONFIG="--disable-system --disable-docs" - TEST_CMD="make -j3 check-tcg V=1" - dist: trusty - compiler: gcc -- 2.11.4.GIT