From 6a259f8d759e0c7f999473fd0668070f5b03ed7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 12 Jun 2018 09:28:23 +0100 Subject: [PATCH 1/3] travis: display config.log when configure fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When configure fails in CI systems we must be able to see the contents of the config.log file to diagnose the root cause. Signed-off-by: Daniel P. Berrangé Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Fam Zheng [AJB: used Eric's suggested {} form] Signed-off-by: Alex Bennée --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 814be151f4..d5e6d50e6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ before_install: - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - git submodule update --init --recursive before_script: - - ./configure ${CONFIG} + - ./configure ${CONFIG} || { cat config.log && exit 1; } script: - make ${MAKEFLAGS} && ${TEST_CMD} matrix: @@ -151,4 +151,4 @@ matrix: - CONFIG="--cc=gcc-7 --cxx=g++-7 --disable-pie --disable-linux-user" - TEST_CMD="" before_script: - - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || cat config.log + - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || { cat config.log && exit 1; } From 73d99c11d2009c2195825fa5de4fb44f867f73b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Tue, 12 Jun 2018 14:24:20 +0100 Subject: [PATCH 2/3] travis: reduce coverage of gprof build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This build is regularly timing out and even switching off linux-user wasn't enough. Instead explicitly choose a target list of broadly the "major" architectures. This is enough to check the gprof build machinery works without worrying about the actual coverage results. I did try various YAML constructs for specifying CONFIG with continuation but couldn't get any of them to work hence the very long line. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d5e6d50e6d..c200dde534 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ matrix: - env: CONFIG="--disable-user" compiler: clang # gprof/gcov are GCC features - - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --disable-linux-user" + - env: 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" compiler: gcc # We manually include builds which we disable "make check" for - env: CONFIG="--enable-debug --enable-tcg-interpreter" From f8309de9b7e7de1bfdfaddf8df4130a06e7e31b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Thu, 14 Jun 2018 11:28:20 +0100 Subject: [PATCH 3/3] travis: reduce time taken for trace-backend testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These builds are reaching regular timeouts and probably don't need to be so widely exercised. ftrace and ust in particular are used in conjunction with whole system profiling which makes most sense with KVM setups, hence the native softmmu target. We also expand simple to cover the multiple log backends while restricting its scope to user-mode testing only. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c200dde534..fabfe9ec34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,13 +86,14 @@ matrix: - env: CONFIG="--enable-debug --enable-tcg-interpreter" TEST_CMD="" compiler: gcc - - env: CONFIG="--enable-trace-backends=simple" + # 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" + - env: CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu" TEST_CMD="" compiler: gcc - - env: CONFIG="--enable-trace-backends=ust" + - env: CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu" TEST_CMD="" compiler: gcc - env: CONFIG="--disable-tcg"